diff --git a/crates/ibc/src/mock/context.rs b/crates/ibc/src/mock/context.rs
index a72ee321f..71af2b628 100644
--- a/crates/ibc/src/mock/context.rs
+++ b/crates/ibc/src/mock/context.rs
@@ -15,9 +15,9 @@ use ibc_proto::protobuf::Protobuf;
 use parking_lot::Mutex;
 use tendermint_testgen::Validator as TestgenValidator;
 use tracing::debug;
+use typed_builder::TypedBuilder;
 
 use self::clients::TmClientStateConfig;
-
 use super::client_state::{MOCK_CLIENT_STATE_TYPE_URL, MOCK_CLIENT_TYPE};
 use super::consensus_state::MOCK_CONSENSUS_STATE_TYPE_URL;
 use crate::clients::ics07_tendermint::client_state::{
@@ -56,7 +56,6 @@ use crate::mock::ics18_relayer::error::RelayerError;
 use crate::prelude::*;
 use crate::signer::Signer;
 use crate::Height;
-use typed_builder::TypedBuilder;
 
 pub const DEFAULT_BLOCK_TIME_SECS: u64 = 3;
 
diff --git a/crates/ibc/src/mock/context/clients.rs b/crates/ibc/src/mock/context/clients.rs
index cac166e9e..b79f0526e 100644
--- a/crates/ibc/src/mock/context/clients.rs
+++ b/crates/ibc/src/mock/context/clients.rs
@@ -3,10 +3,10 @@
 use core::time::Duration;
 
 use super::{AnyClientState, AnyConsensusState, MockClientRecord, MockContext};
-use crate::clients::ics07_tendermint::client_state::AllowUpdate;
+use crate::clients::ics07_tendermint::client_state::{AllowUpdate, ClientState as TmClientState};
+use crate::clients::ics07_tendermint::error::Error as TmClientError;
 use crate::clients::ics07_tendermint::trust_threshold::TrustThreshold;
 use crate::clients::ics07_tendermint::{
-    client_state::ClientState as TmClientState, error::Error as TmClientError,
     CommonContext as TmCommonContext, ValidationContext as TmValidationContext,
 };
 use crate::core::ics02_client::error::ClientError;