diff --git a/server/src/job.rs b/server/src/job.rs
index 7d8d3b567c..41163186b6 100644
--- a/server/src/job.rs
+++ b/server/src/job.rs
@@ -107,12 +107,12 @@ impl JobRegistryMetrics {
                 .register_metric("influxdb_iox_job_count", "Number of known jobs"),
             completed_accu: Default::default(),
             cpu_time_histogram: metric_registry_v2.register_metric(
-                "influxdb_iox_job_completed_cpu_nanoseconds",
-                "CPU time of of completed jobs in nanoseconds",
+                "influxdb_iox_job_completed_cpu",
+                "CPU time of of completed jobs",
             ),
             wall_time_histogram: metric_registry_v2.register_metric(
-                "influxdb_iox_job_completed_wall_nanoseconds",
-                "Wall time of of completed jobs in nanoseconds",
+                "influxdb_iox_job_completed_wall",
+                "Wall time of of completed jobs",
             ),
             completed_but_still_tracked: Default::default(),
         }
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 38c9d11ae9..649041e236 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -2484,13 +2484,11 @@ mod tests {
         );
         assert_eq!(observation, &metric::Observation::U64Gauge(1));
 
-        // ========== influxdb_iox_job_completed_cpu_nanoseconds ==========
+        // ========== influxdb_iox_job_completed_cpu ==========
         let observations: Vec<_> = reporter
             .observations()
             .iter()
-            .filter(|observation| {
-                observation.metric_name == "influxdb_iox_job_completed_cpu_nanoseconds"
-            })
+            .filter(|observation| observation.metric_name == "influxdb_iox_job_completed_cpu")
             .collect();
         assert_eq!(observations.len(), 1);
 
@@ -2507,13 +2505,11 @@ mod tests {
             ])
         );
 
-        // ========== influxdb_iox_job_completed_wall_nanoseconds ==========
+        // ========== influxdb_iox_job_completed_wall ==========
         let observations: Vec<_> = reporter
             .observations()
             .iter()
-            .filter(|observation| {
-                observation.metric_name == "influxdb_iox_job_completed_wall_nanoseconds"
-            })
+            .filter(|observation| observation.metric_name == "influxdb_iox_job_completed_wall")
             .collect();
         assert_eq!(observations.len(), 1);