diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index 3bca621f7020..bac54a0a7a24 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -59,8 +59,8 @@ std = [
 	"bp-polkadot-core/std",
 	"bp-relayers/std",
 	"bp-runtime/std",
-	"bp-xcm-bridge-hub/std",
 	"bp-xcm-bridge-hub-router/std",
+	"bp-xcm-bridge-hub/std",
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
index 7a86d85c86fc..fee95a382887 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
@@ -1457,9 +1457,9 @@ pub mod test_data {
 			);
 		// to compute proper cost of GRANDPA call, let's add some dummy bytes to header, so that the
 		// `submit_finality_proof` call size would be close to maximal expected (and refundable)
-		let expected_bytes_in_grandpa_call = BridgedRelayChain::AVERAGE_HEADER_SIZE_IN_JUSTIFICATION
+		let expected_bytes_in_grandpa_call = BridgedRelayChain::AVERAGE_HEADER_SIZE
 			.saturating_mul(BridgedRelayChain::REASONABLE_HEADERS_IN_JUSTIFICATON_ANCESTRY)
-			.saturating_add(BridgedRelayChain::MAX_HEADER_SIZE)
+			.saturating_add(BridgedRelayChain::MAX_MANDATORY_HEADER_SIZE)
 			as usize;
 		let extra_bytes_required =
 			expected_bytes_in_grandpa_call.saturating_sub(relay_chain_header.encoded_size());