diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc
index e206a10..fb294fb 100644
--- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc
+++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc
@@ -904,7 +904,7 @@
                       ImproveDirection::kSmallerIsBetter);
   } else {
     metrics_logger_->LogSingleValueMetric(
-        "cpu_usage", test_label_, GetCpuUsagePercent(), Unit::kPercent,
+        "cpu_usage_%", test_label_, GetCpuUsagePercent(), Unit::kUnitless,
         ImprovementDirection::kSmallerIsBetter);
   }
   LogFrameCounters("Global", frame_counters_);
diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_metric_names_test.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_metric_names_test.cc
index 560d589..a54bf2f 100644
--- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_metric_names_test.cc
+++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_metric_names_test.cc
@@ -315,8 +315,8 @@
               .unit = Unit::kCount,
               .improvement_direction = ImprovementDirection::kBiggerIsBetter},
           MetricValidationInfo{.test_case = "test_case",
-                               .name = "cpu_usage",
-                               .unit = Unit::kPercent,
+                               .name = "cpu_usage_%",
+                               .unit = Unit::kUnitless,
                                .improvement_direction =
                                    ImprovementDirection::kSmallerIsBetter}));
 }
@@ -614,8 +614,8 @@
               .unit = Unit::kCount,
               .improvement_direction = ImprovementDirection::kBiggerIsBetter},
           MetricValidationInfo{.test_case = "test_case",
-                               .name = "cpu_usage",
-                               .unit = Unit::kPercent,
+                               .name = "cpu_usage_%",
+                               .unit = Unit::kUnitless,
                                .improvement_direction =
                                    ImprovementDirection::kSmallerIsBetter}));
 }
diff --git a/test/pc/e2e/peer_connection_quality_test_metric_names_test.cc b/test/pc/e2e/peer_connection_quality_test_metric_names_test.cc
index 304064a..804d089 100644
--- a/test/pc/e2e/peer_connection_quality_test_metric_names_test.cc
+++ b/test/pc/e2e/peer_connection_quality_test_metric_names_test.cc
@@ -426,8 +426,8 @@
               .improvement_direction = ImprovementDirection::kNeitherIsBetter},
           MetricValidationInfo{
               .test_case = "test_case",
-              .name = "cpu_usage",
-              .unit = Unit::kPercent,
+              .name = "cpu_usage_%",
+              .unit = Unit::kUnitless,
               .improvement_direction = ImprovementDirection::kSmallerIsBetter},
 
           // Metrics from StatsBasedNetworkQualityMetricsReporter