diff --git a/src/ci/citool/src/analysis.rs b/src/ci/citool/src/analysis.rs
index 6469bc251be..2088ce29620 100644
--- a/src/ci/citool/src/analysis.rs
+++ b/src/ci/citool/src/analysis.rs
@@ -1,10 +1,12 @@
-use crate::metrics;
-use crate::metrics::{JobMetrics, JobName, get_test_suites};
-use crate::utils::{output_details, pluralize};
+use std::collections::{BTreeMap, HashMap, HashSet};
+
 use build_helper::metrics::{
     BuildStep, JsonRoot, TestOutcome, TestSuite, TestSuiteMetadata, format_build_steps,
 };
-use std::collections::{BTreeMap, HashMap, HashSet};
+
+use crate::metrics;
+use crate::metrics::{JobMetrics, JobName, get_test_suites};
+use crate::utils::{output_details, pluralize};
 
 pub fn output_bootstrap_stats(metrics: &JsonRoot) {
     if !metrics.invocations.is_empty() {
diff --git a/src/ci/citool/src/main.rs b/src/ci/citool/src/main.rs
index 29f94e2be5d..9e4b558d77a 100644
--- a/src/ci/citool/src/main.rs
+++ b/src/ci/citool/src/main.rs
@@ -9,6 +9,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
+use analysis::output_bootstrap_stats;
 use anyhow::Context;
 use clap::Parser;
 use jobs::JobDatabase;
@@ -20,7 +21,6 @@ use crate::datadog::upload_datadog_metric;
 use crate::jobs::RunType;
 use crate::metrics::{JobMetrics, download_auto_job_metrics, download_job_metrics, load_metrics};
 use crate::utils::{load_env_var, output_details};
-use analysis::output_bootstrap_stats;
 
 const CI_DIRECTORY: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/..");
 const DOCKER_DIRECTORY: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../docker");
diff --git a/src/ci/citool/src/metrics.rs b/src/ci/citool/src/metrics.rs
index 117a4f372c4..263011a3370 100644
--- a/src/ci/citool/src/metrics.rs
+++ b/src/ci/citool/src/metrics.rs
@@ -1,9 +1,10 @@
+use std::collections::HashMap;
 use std::path::Path;
 
-use crate::jobs::JobDatabase;
 use anyhow::Context;
 use build_helper::metrics::{JsonNode, JsonRoot, TestSuite};
-use std::collections::HashMap;
+
+use crate::jobs::JobDatabase;
 
 pub type JobName = String;