1 files changed, 6 insertions, 6 deletions
diff --git a/src/components/telemetry_monitor/test/application_manager_metric_test.cc b/src/components/telemetry_monitor/test/application_manager_metric_test.cc
index 9029c41bc4..c3f0c26cde 100644
--- a/src/components/telemetry_monitor/test/application_manager_metric_test.cc
+++ b/src/components/telemetry_monitor/test/application_manager_metric_test.cc
@@ -57,15 +57,15 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetric) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric =
-      new application_manager::AMTelemetryObserver::MessageMetric();
+  metric_test.message_metric = std::make_shared<
+      application_manager::AMTelemetryObserver::MessageMetric>();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   NsSmartDeviceLink::NsSmartObjects::SmartObject obj;
   obj["params"][application_manager::strings::correlation_id] = 11;
   obj["params"][application_manager::strings::connection_key] = 12;
   metric_test.message_metric->message =
-      new NsSmartDeviceLink::NsSmartObjects::SmartObject(obj);
+      std::make_shared<NsSmartDeviceLink::NsSmartObjects::SmartObject>(obj);
   Json::Value jvalue = metric_test.GetJsonMetric();
 
   EXPECT_EQ("null\n",
@@ -98,15 +98,15 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) {
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
 
-  metric_test.message_metric =
-      new application_manager::AMTelemetryObserver::MessageMetric();
+  metric_test.message_metric = std::make_shared<
+      application_manager::AMTelemetryObserver::MessageMetric>();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   NsSmartDeviceLink::NsSmartObjects::SmartObject obj;
   obj["params"][application_manager::strings::correlation_id] = 11;
   obj["params"][application_manager::strings::connection_key] = 12;
   metric_test.message_metric->message =
-      new NsSmartDeviceLink::NsSmartObjects::SmartObject(obj);
+      std::make_shared<NsSmartDeviceLink::NsSmartObjects::SmartObject>(obj);
   Json::Value jvalue = metric_test.GetJsonMetric();
 
   EXPECT_EQ(date_time::DateTime::getuSecs(start_time),