diff --git a/cli/src/context.rs b/cli/src/context.rs
index 0f3a3ec1..6a5d8cf1 100644
--- a/cli/src/context.rs
+++ b/cli/src/context.rs
@@ -8,7 +8,7 @@ use std::{
     time::{SystemTime, UNIX_EPOCH},
 };
 
-use api::message::CreateBundleUploadResponse;
+use api::{client::ApiClient, message::CreateBundleUploadResponse};
 use bundle::{
     parse_custom_tags, BundleMeta, BundleMetaBaseProps, BundleMetaDebugProps, BundleMetaJunitProps,
     FileSet, FileSetBuilder, QuarantineBulkTestStatus, META_VERSION,
@@ -31,7 +31,6 @@ use crate::{
     test_command::TestRunResult,
     upload_command::UploadArgs,
 };
-use api::client::ApiClient;
 
 pub struct PreTestContext {
     pub meta: BundleMeta,
diff --git a/cli/src/context_quarantine.rs b/cli/src/context_quarantine.rs
index 0247df9f..37cc9831 100644
--- a/cli/src/context_quarantine.rs
+++ b/cli/src/context_quarantine.rs
@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 
+use api::client::ApiClient;
 use bundle::{FileSet, FileSetBuilder, QuarantineBulkTestStatus, Test};
 use constants::{EXIT_FAILURE, EXIT_SUCCESS};
 use context::{
@@ -8,8 +9,6 @@ use context::{
 };
 use quick_junit::TestCaseStatus;
 
-use api::client::ApiClient;
-
 #[derive(Debug, Default, Clone)]
 pub struct QuarantineContext {
     pub exit_code: i32,
diff --git a/cli/src/upload_command.rs b/cli/src/upload_command.rs
index 048b0d37..8aede84a 100644
--- a/cli/src/upload_command.rs
+++ b/cli/src/upload_command.rs
@@ -1,5 +1,4 @@
-use api::client::ApiClient;
-use api::message::BundleUploadStatus;
+use api::{client::ApiClient, message::BundleUploadStatus};
 use bundle::{BundleMeta, BundlerUtil};
 use clap::{ArgAction, Args};
 use constants::EXIT_SUCCESS;