diff --git a/health_metric_config.cpp b/health_metric_config.cpp
index e506f17..08ed3c3 100644
--- a/health_metric_config.cpp
+++ b/health_metric_config.cpp
@@ -211,35 +211,11 @@
     },
     "CPU_User": {
         "Frequency": 1,
-        "Window_size": 120,
-        "Threshold": {
-            "Critical_Upper": {
-                "Value": 90.0,
-                "Log": true,
-                "Target": ""
-            },
-            "Warning_Upper": {
-                "Value": 80.0,
-                "Log": false,
-                "Target": ""
-            }
-        }
+        "Window_size": 120
     },
     "CPU_Kernel": {
         "Frequency": 1,
-        "Window_size": 120,
-        "Threshold": {
-            "Critical_Upper": {
-                "Value": 90.0,
-                "Log": true,
-                "Target": ""
-            },
-            "Warning_Upper": {
-                "Value": 80.0,
-                "Log": false,
-                "Target": ""
-            }
-        }
+        "Window_size": 120
     },
     "Memory": {
         "Frequency": 1,
diff --git a/test/test_health_metric_collection.cpp b/test/test_health_metric_collection.cpp
index 4cd6a6b..e9aa000 100644
--- a/test/test_health_metric_collection.cpp
+++ b/test/test_health_metric_collection.cpp
@@ -159,7 +159,7 @@
                 sd_bus_message_new_signal(IsNull(), NotNull(), NotNull(),
                                           StrEq(thresholdInterface),
                                           StrEq("AssertionChanged")))
-        .Times(12);
+        .Times(8);
 
     createCollection();
 }
diff --git a/test/test_health_metric_config.cpp b/test/test_health_metric_config.cpp
index c13e819..2670dab 100644
--- a/test/test_health_metric_config.cpp
+++ b/test/test_health_metric_config.cpp
@@ -58,6 +58,7 @@
 TEST(HealthMonitorConfigTest, TestConfigValues)
 {
     auto healthMetricConfigs = getHealthMetricConfigs();
+    auto count_with_thresholds = 0;
     for (const auto& [type, configs] : healthMetricConfigs)
     {
         EXPECT_NE(type, metric::Type::unknown);
@@ -68,7 +69,12 @@
             EXPECT_TRUE(isValidSubType(type, config.subType));
             EXPECT_GE(config.collectionFreq, HealthMetric::defaults::frequency);
             EXPECT_GE(config.windowSize, HealthMetric::defaults::windowSize);
-            EXPECT_GE(config.thresholds.size(), minConfigSize);
+            if (config.thresholds.size())
+            {
+                count_with_thresholds++;
+            }
         }
+
+        EXPECT_GE(count_with_thresholds, 1);
     }
 }