diff --git a/ibc-testkit/src/testapp/ibc/core/types.rs b/ibc-testkit/src/testapp/ibc/core/types.rs
index b6c5c3c95b..28037cf5d2 100644
--- a/ibc-testkit/src/testapp/ibc/core/types.rs
+++ b/ibc-testkit/src/testapp/ibc/core/types.rs
@@ -10,7 +10,7 @@ use basecoin_store::impls::{GrowingStore, InMemoryStore, RevertibleStore, Shared
 use basecoin_store::types::{BinStore, JsonStore, ProtobufStore, TypedSet, TypedStore};
 use ibc::core::channel::types::channel::ChannelEnd;
 use ibc::core::channel::types::commitment::{AcknowledgementCommitment, PacketCommitment};
-use ibc::core::client::context::ClientExecutionContext;
+use ibc::core::client::context::{ClientExecutionContext, ClientValidationContext};
 use ibc::core::client::types::Height;
 use ibc::core::connection::types::ConnectionEnd;
 use ibc::core::entrypoint::dispatch;
diff --git a/ibc-testkit/tests/core/ics02_client/create_client.rs b/ibc-testkit/tests/core/ics02_client/create_client.rs
index 6e78e257db..85eb7e136e 100644
--- a/ibc-testkit/tests/core/ics02_client/create_client.rs
+++ b/ibc-testkit/tests/core/ics02_client/create_client.rs
@@ -50,7 +50,8 @@ fn test_create_client_ok() {
 
     assert!(res.is_ok(), "execution happy path");
 
-    let expected_client_state = ClientStateRef::<MockContext>::try_from(msg.client_state).unwrap();
+    let expected_client_state =
+        ClientStateRef::<MockContext<MockHost>>::try_from(msg.client_state).unwrap();
     assert_eq!(expected_client_state.client_type(), client_type);
     assert_eq!(ctx.client_state(&client_id).unwrap(), expected_client_state);
 }
@@ -86,7 +87,8 @@ fn test_tm_create_client_ok() {
 
     assert!(res.is_ok(), "tendermint client execution happy path");
 
-    let expected_client_state = ClientStateRef::<MockContext>::try_from(msg.client_state).unwrap();
+    let expected_client_state =
+        ClientStateRef::<MockContext<MockHost>>::try_from(msg.client_state).unwrap();
     assert_eq!(expected_client_state.client_type(), client_type);
     assert_eq!(ctx.client_state(&client_id).unwrap(), expected_client_state);
 }
diff --git a/ibc-testkit/tests/core/ics02_client/upgrade_client.rs b/ibc-testkit/tests/core/ics02_client/upgrade_client.rs
index 304d85a83b..620b00e9a3 100644
--- a/ibc-testkit/tests/core/ics02_client/upgrade_client.rs
+++ b/ibc-testkit/tests/core/ics02_client/upgrade_client.rs
@@ -8,7 +8,6 @@ use ibc::core::handler::types::error::ContextError;
 use ibc::core::handler::types::events::{IbcEvent, MessageEvent};
 use ibc::core::handler::types::msgs::MsgEnvelope;
 use ibc::core::host::types::path::ClientConsensusStatePath;
-use ibc::core::host::ValidationContext;
 use ibc_testkit::fixtures::clients::tendermint::{
     dummy_tendermint_header, dummy_tm_client_state_from_header,
 };
diff --git a/ibc-testkit/tests/core/ics04_channel/acknowledgement.rs b/ibc-testkit/tests/core/ics04_channel/acknowledgement.rs
index bee3f9f919..ccf769192c 100644
--- a/ibc-testkit/tests/core/ics04_channel/acknowledgement.rs
+++ b/ibc-testkit/tests/core/ics04_channel/acknowledgement.rs
@@ -39,7 +39,7 @@ fn fixture() -> Fixture {
 
     let client_height = Height::new(0, 2).unwrap();
     let ctx = MockContext::<MockHost>::default().with_light_client(
-        &ClientId::default(),
+        &ClientId::new("07-tendermint", 0).expect("no error"),
         LightClientState::<MockHost>::with_latest_height(client_height),
     );
 
@@ -125,7 +125,7 @@ fn ack_success_no_packet_commitment(fixture: Fixture) {
     } = fixture;
     let ctx = ctx
         .with_light_client(
-            &ClientId::default(),
+            &ClientId::new("07-tendermint", 0).expect("no error"),
             LightClientState::<MockHost>::with_latest_height(client_height),
         )
         .with_channel(
@@ -160,7 +160,7 @@ fn ack_success_happy_path(fixture: Fixture) {
     } = fixture;
     let mut ctx = ctx
         .with_light_client(
-            &ClientId::default(),
+            &ClientId::new("07-tendermint", 0).expect("no error"),
             LightClientState::<MockHost>::with_latest_height(client_height),
         )
         .with_channel(
diff --git a/ibc-testkit/tests/core/ics04_channel/recv_packet.rs b/ibc-testkit/tests/core/ics04_channel/recv_packet.rs
index a6494ed72d..6eae58c6e6 100644
--- a/ibc-testkit/tests/core/ics04_channel/recv_packet.rs
+++ b/ibc-testkit/tests/core/ics04_channel/recv_packet.rs
@@ -38,6 +38,7 @@ pub struct Fixture {
 #[fixture]
 fn fixture() -> Fixture {
     let context = MockContext::<MockHost>::default();
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
 
     let router = MockRouter::new_with_transfer();
 
@@ -120,7 +121,7 @@ fn recv_packet_validate_happy_path(fixture: Fixture) {
     let packet = &msg.packet;
     let mut context = context
         .with_light_client(
-            &ClientId::default(),
+            &ClientId::new("07-tendermint", 0).expect("no error"),
             LightClientState::<MockHost>::with_latest_height(client_height),
         )
         .with_connection(ConnectionId::zero(), conn_end_on_b)
@@ -197,7 +198,7 @@ fn recv_packet_timeout_expired(fixture: Fixture) {
 
     let context = context
         .with_light_client(
-            &ClientId::default(),
+            &ClientId::new("07-tendermint", 0).expect("no error"),
             LightClientState::<MockHost>::with_latest_height(client_height),
         )
         .with_connection(ConnectionId::zero(), conn_end_on_b)
@@ -226,7 +227,7 @@ fn recv_packet_execute_happy_path(fixture: Fixture) {
     } = fixture;
     let mut ctx = context
         .with_light_client(
-            &ClientId::default(),
+            &ClientId::new("07-tendermint", 0).expect("no error"),
             LightClientState::<MockHost>::with_latest_height(client_height),
         )
         .with_connection(ConnectionId::zero(), conn_end_on_b)
diff --git a/ibc-testkit/tests/core/ics04_channel/send_packet.rs b/ibc-testkit/tests/core/ics04_channel/send_packet.rs
index c760188110..01c17cf18f 100644
--- a/ibc-testkit/tests/core/ics04_channel/send_packet.rs
+++ b/ibc-testkit/tests/core/ics04_channel/send_packet.rs
@@ -94,7 +94,7 @@ fn send_packet_processing() {
             name: "Good parameters".to_string(),
             ctx: MockContext::<MockHost>::default()
                 .with_light_client(
-                    &ClientId::default(),
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
                     LightClientState::<MockHost>::with_latest_height(client_height),
                 )
                 .with_connection(ConnectionId::zero(), conn_end_on_a.clone())
@@ -107,7 +107,7 @@ fn send_packet_processing() {
             name: "Packet timeout height same as destination chain height".to_string(),
             ctx: MockContext::<MockHost>::default()
                 .with_light_client(
-                    &ClientId::default(),
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
                     LightClientState::<MockHost>::with_latest_height(client_height),
                 )
                 .with_connection(ConnectionId::zero(), conn_end_on_a.clone())
@@ -120,7 +120,7 @@ fn send_packet_processing() {
             name: "Packet timeout height one more than destination chain height".to_string(),
             ctx: MockContext::<MockHost>::default()
                 .with_light_client(
-                    &ClientId::default(),
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
                     LightClientState::<MockHost>::with_latest_height(client_height),
                 )
                 .with_connection(ConnectionId::zero(), conn_end_on_a.clone())
@@ -133,7 +133,7 @@ fn send_packet_processing() {
             name: "Packet timeout due to timestamp".to_string(),
             ctx: MockContext::<MockHost>::default()
                 .with_light_client(
-                    &ClientId::default(),
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
                     LightClientState::<MockHost>::with_latest_height(client_height),
                 )
                 .with_connection(ConnectionId::zero(), conn_end_on_a)
diff --git a/ibc-testkit/tests/core/ics04_channel/timeout.rs b/ibc-testkit/tests/core/ics04_channel/timeout.rs
index 1b0110a1ee..ead2045d93 100644
--- a/ibc-testkit/tests/core/ics04_channel/timeout.rs
+++ b/ibc-testkit/tests/core/ics04_channel/timeout.rs
@@ -39,7 +39,7 @@ fn fixture() -> Fixture {
 
     let client_height = Height::new(0, 2).unwrap();
     let ctx = MockContext::<MockHost>::default().with_light_client(
-        &ClientId::default(),
+        &ClientId::new("07-tendermint", 0).expect("no error"),
         LightClientState::<MockHost>::with_latest_height(client_height),
     );
 
@@ -115,7 +115,7 @@ fn timeout_fail_no_channel(fixture: Fixture) {
         ..
     } = fixture;
     let ctx = ctx.with_light_client(
-        &ClientId::default(),
+        &ClientId::new("07-tendermint", 0).expect("no error"),
         LightClientState::<MockHost>::with_latest_height(client_height),
     );
     let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
@@ -192,7 +192,7 @@ fn timeout_fail_proof_timeout_not_reached(fixture: Fixture) {
 
     let mut ctx = ctx
         .with_light_client(
-            &ClientId::default(),
+            &ClientId::new("07-tendermint", 0).expect("no error"),
             LightClientState::<MockHost>::with_latest_height(client_height),
         )
         .with_connection(ConnectionId::zero(), conn_end_on_a)
@@ -273,7 +273,7 @@ fn timeout_unordered_channel_validate(fixture: Fixture) {
 
     let mut ctx = ctx
         .with_light_client(
-            &ClientId::default(),
+            &ClientId::new("07-tendermint", 0).expect("no error"),
             LightClientState::<MockHost>::with_latest_height(client_height),
         )
         .with_connection(ConnectionId::zero(), conn_end_on_a)
@@ -323,7 +323,7 @@ fn timeout_ordered_channel_validate(fixture: Fixture) {
 
     let mut ctx = ctx
         .with_light_client(
-            &ClientId::default(),
+            &ClientId::new("07-tendermint", 0).expect("no error"),
             LightClientState::<MockHost>::with_latest_height(client_height),
         )
         .with_connection(ConnectionId::zero(), conn_end_on_a)
diff --git a/ibc-testkit/tests/core/ics04_channel/timeout_on_close.rs b/ibc-testkit/tests/core/ics04_channel/timeout_on_close.rs
index 5e5db14176..2378d590d2 100644
--- a/ibc-testkit/tests/core/ics04_channel/timeout_on_close.rs
+++ b/ibc-testkit/tests/core/ics04_channel/timeout_on_close.rs
@@ -35,7 +35,7 @@ fn fixture() -> Fixture {
 
     let client_height = Height::new(0, 2).unwrap();
     let context = MockContext::<MockHost>::default().with_light_client(
-        &ClientId::default(),
+        &ClientId::new("07-tendermint", 0).expect("no error"),
         LightClientState::<MockHost>::with_latest_height(client_height),
     );
     let router = MockRouter::new_with_transfer();