diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
index 9bd4085c317ed1..795cdcdf41a986 100644
--- a/scripts/tests/chiptest/__init__.py
+++ b/scripts/tests/chiptest/__init__.py
@@ -138,7 +138,6 @@ def _GetInDevelopmentTests() -> Set[str]:
         "Test_TC_ACL_2_9.yaml",
         "TestEvents.yaml",
 
-        "TestClusterMultiFabric.yaml",  # Enum mismatch
         "TestGroupMessaging.yaml",     # Needs group support in repl
         "TestMultiAdmin.yaml",         # chip-repl hang on command expeted to fail
     }
diff --git a/src/app/tests/suites/TestClusterMultiFabric.yaml b/src/app/tests/suites/TestClusterMultiFabric.yaml
index 852e9e51a9f5be..97b38ee103df85 100644
--- a/src/app/tests/suites/TestClusterMultiFabric.yaml
+++ b/src/app/tests/suites/TestClusterMultiFabric.yaml
@@ -135,7 +135,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 12,
+                              c: 2,
                               d: "",
                               e: "",
                               f: 11,
@@ -155,7 +155,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 13,
+                              c: 1,
                               d: "",
                               e: "",
                               f: 12,
@@ -235,7 +235,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 12,
+                              c: 2,
                               d: "",
                               e: "",
                               f: 11,
@@ -255,7 +255,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 13,
+                              c: 1,
                               d: "",
                               e: "",
                               f: 12,
@@ -420,7 +420,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 12,
+                              c: 2,
                               d: "",
                               e: "",
                               f: 11,
@@ -440,7 +440,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 13,
+                              c: 1,
                               d: "",
                               e: "",
                               f: 12,
@@ -470,7 +470,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 52,
+                              c: 2,
                               d: "",
                               e: "",
                               f: 51,
@@ -500,7 +500,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 12,
+                              c: 2,
                               d: "",
                               e: "",
                               f: 11,
@@ -520,7 +520,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 13,
+                              c: 1,
                               d: "",
                               e: "",
                               f: 12,
@@ -550,7 +550,7 @@ tests:
                           {
                               a: 0,
                               b: true,
-                              c: 52,
+                              c: 2,
                               d: "",
                               e: "",
                               f: 51,