diff --git a/scripts/idl/tests/outputs/cluster_struct_attribute/cpp/BridgeClustersImpl.h b/scripts/idl/tests/outputs/cluster_struct_attribute/cpp/BridgeClustersImpl.h
index 8b33c1698d9291..78ec3c5ab7be5e 100644
--- a/scripts/idl/tests/outputs/cluster_struct_attribute/cpp/BridgeClustersImpl.h
+++ b/scripts/idl/tests/outputs/cluster_struct_attribute/cpp/BridgeClustersImpl.h
@@ -9,7 +9,7 @@ struct DemoClusterCluster : public CommonCluster
 {
 
 
-  static constexpr chip::ClusterId kClusterId = ZCL_DEMO_CLUSTER_CLUSTER_ID;
+  static constexpr chip::ClusterId kClusterId = 10;
 
   chip::ClusterId GetClusterId() override { return kClusterId; }
 
@@ -117,7 +117,7 @@ struct ClusterInfo
 } static const kKnownClusters[] = {
 
   {
-    ZCL_DEMO_CLUSTER_CLUSTER_ID,
+    10,
     "DemoCluster",
     sizeof(DemoClusterCluster),
     [](void *mem) -> CommonCluster* {
@@ -140,8 +140,8 @@ struct AttrInfo
   const char *name;
 } static const kKnownAttributes[] = {
 
-  {ZCL_DEMO_CLUSTER_CLUSTER_ID, 5, "SingleFailSafe" },
-  {ZCL_DEMO_CLUSTER_CLUSTER_ID, 100, "ArmFailsafes" },
+  { 10, 5, "SingleFailSafe" },
+  { 10, 100, "ArmFailsafes" },
   
 };
 
diff --git a/scripts/idl/tests/outputs/global_struct_attribute/cpp/BridgeClustersImpl.h b/scripts/idl/tests/outputs/global_struct_attribute/cpp/BridgeClustersImpl.h
index 66c25877e96956..f92843f069280f 100644
--- a/scripts/idl/tests/outputs/global_struct_attribute/cpp/BridgeClustersImpl.h
+++ b/scripts/idl/tests/outputs/global_struct_attribute/cpp/BridgeClustersImpl.h
@@ -32,7 +32,7 @@ struct DemoClusterCluster : public CommonCluster
 {
 
 
-  static constexpr chip::ClusterId kClusterId = ZCL_DEMO_CLUSTER_CLUSTER_ID;
+  static constexpr chip::ClusterId kClusterId = 18;
 
   chip::ClusterId GetClusterId() override { return kClusterId; }
 
@@ -140,7 +140,7 @@ struct ClusterInfo
 } static const kKnownClusters[] = {
 
   {
-    ZCL_DEMO_CLUSTER_CLUSTER_ID,
+    18,
     "DemoCluster",
     sizeof(DemoClusterCluster),
     [](void *mem) -> CommonCluster* {
@@ -163,8 +163,8 @@ struct AttrInfo
   const char *name;
 } static const kKnownAttributes[] = {
 
-  {ZCL_DEMO_CLUSTER_CLUSTER_ID, 32, "SingleLabel" },
-  {ZCL_DEMO_CLUSTER_CLUSTER_ID, 33, "SomeLabels" },
+  { 18, 32, "SingleLabel" },
+  { 18, 33, "SomeLabels" },
   
 };
 
diff --git a/scripts/idl/tests/outputs/several_clusters/cpp/BridgeClustersImpl.h b/scripts/idl/tests/outputs/several_clusters/cpp/BridgeClustersImpl.h
index dd2eadd39dcf6f..6cea2430bd0c86 100644
--- a/scripts/idl/tests/outputs/several_clusters/cpp/BridgeClustersImpl.h
+++ b/scripts/idl/tests/outputs/several_clusters/cpp/BridgeClustersImpl.h
@@ -9,7 +9,7 @@ struct FirstCluster : public CommonCluster
 {
 
 
-  static constexpr chip::ClusterId kClusterId = ZCL_FIRST_CLUSTER_ID;
+  static constexpr chip::ClusterId kClusterId = 1;
 
   chip::ClusterId GetClusterId() override { return kClusterId; }
 
@@ -98,7 +98,7 @@ struct SecondCluster : public CommonCluster
 {
 
 
-  static constexpr chip::ClusterId kClusterId = ZCL_SECOND_CLUSTER_ID;
+  static constexpr chip::ClusterId kClusterId = 2;
 
   chip::ClusterId GetClusterId() override { return kClusterId; }
 
@@ -187,7 +187,7 @@ struct ThirdCluster : public CommonCluster
 {
 
 
-  static constexpr chip::ClusterId kClusterId = ZCL_THIRD_CLUSTER_ID;
+  static constexpr chip::ClusterId kClusterId = 3;
 
   chip::ClusterId GetClusterId() override { return kClusterId; }
 
@@ -282,7 +282,7 @@ struct ClusterInfo
 } static const kKnownClusters[] = {
 
   {
-    ZCL_FIRST_CLUSTER_ID,
+    1,
     "First",
     sizeof(FirstCluster),
     [](void *mem) -> CommonCluster* {
@@ -290,7 +290,7 @@ struct ClusterInfo
     },
   },
   {
-    ZCL_SECOND_CLUSTER_ID,
+    2,
     "Second",
     sizeof(SecondCluster),
     [](void *mem) -> CommonCluster* {
@@ -298,7 +298,7 @@ struct ClusterInfo
     },
   },
   {
-    ZCL_THIRD_CLUSTER_ID,
+    3,
     "Third",
     sizeof(ThirdCluster),
     [](void *mem) -> CommonCluster* {
@@ -325,9 +325,9 @@ struct AttrInfo
   const char *name;
 } static const kKnownAttributes[] = {
 
-  {ZCL_FIRST_CLUSTER_ID, 1, "SomeInteger" },
-  {ZCL_SECOND_CLUSTER_ID, 123, "SomeBytes" },
-  {ZCL_THIRD_CLUSTER_ID, 10, "SomeEnum" },
+  { 1, 1, "SomeInteger" },
+  { 2, 123, "SomeBytes" },
+  { 3, 10, "SomeEnum" },
   
 };
 
diff --git a/scripts/idl/tests/outputs/simple_attribute/cpp/BridgeClustersImpl.h b/scripts/idl/tests/outputs/simple_attribute/cpp/BridgeClustersImpl.h
index f1ab64679102e1..e276240132a6fa 100644
--- a/scripts/idl/tests/outputs/simple_attribute/cpp/BridgeClustersImpl.h
+++ b/scripts/idl/tests/outputs/simple_attribute/cpp/BridgeClustersImpl.h
@@ -9,7 +9,7 @@ struct MyClusterCluster : public CommonCluster
 {
 
 
-  static constexpr chip::ClusterId kClusterId = ZCL_MY_CLUSTER_CLUSTER_ID;
+  static constexpr chip::ClusterId kClusterId = 123;
 
   chip::ClusterId GetClusterId() override { return kClusterId; }
 
@@ -104,7 +104,7 @@ struct ClusterInfo
 } static const kKnownClusters[] = {
 
   {
-    ZCL_MY_CLUSTER_CLUSTER_ID,
+    123,
     "MyCluster",
     sizeof(MyClusterCluster),
     [](void *mem) -> CommonCluster* {
@@ -127,7 +127,7 @@ struct AttrInfo
   const char *name;
 } static const kKnownAttributes[] = {
 
-  {ZCL_MY_CLUSTER_CLUSTER_ID, 1, "ClusterAttr" },
+  { 123, 1, "ClusterAttr" },
   
 };