diff --git a/substrate/bin/node/testing/src/bench.rs b/substrate/bin/node/testing/src/bench.rs
index ddc06b87065d..27c569d9aabe 100644
--- a/substrate/bin/node/testing/src/bench.rs
+++ b/substrate/bin/node/testing/src/bench.rs
@@ -576,14 +576,19 @@ impl BenchKeyring {
 					None::<()>,
 				);
 				let key = self.accounts.get(&signed).expect("Account id not found in keyring");
-				let signature = payload.using_encoded(|b| key.sign(&blake2_256(b)));
+				let signature = payload.using_encoded(|b| {
+					if b.len() > 256 {
+						key.sign(&blake2_256(b))
+					} else {
+						key.sign(b)
+					}
+				});
 				UncheckedExtrinsic {
 					preamble: Preamble::Signed(
 						sp_runtime::MultiAddress::Id(signed),
 						signature,
 						0,
 						tx_ext,
-						EXTRINSIC_FORMAT_VERSION,
 					),
 					function: payload.0,
 				}
diff --git a/substrate/bin/node/testing/src/keyring.rs b/substrate/bin/node/testing/src/keyring.rs
index b02e629332f4..a70932524dd6 100644
--- a/substrate/bin/node/testing/src/keyring.rs
+++ b/substrate/bin/node/testing/src/keyring.rs
@@ -106,14 +106,22 @@ pub fn sign(
 				metadata_hash,
 			);
 			let key = AccountKeyring::from_account_id(&signed).unwrap();
-			let signature = payload.using_encoded(|b| key.sign(&blake2_256(b))).into();
+			let signature =
+				payload
+					.using_encoded(|b| {
+						if b.len() > 256 {
+							key.sign(&blake2_256(b))
+						} else {
+							key.sign(b)
+						}
+					})
+					.into();
 			UncheckedExtrinsic {
 				preamble: sp_runtime::generic::Preamble::Signed(
 					sp_runtime::MultiAddress::Id(signed),
 					signature,
 					0,
 					tx_ext,
-					EXTRINSIC_FORMAT_VERSION,
 				),
 				function: payload.0,
 			}
diff --git a/substrate/frame/examples/offchain-worker/src/tests.rs b/substrate/frame/examples/offchain-worker/src/tests.rs
index fe60aa5026ca..755beb8b82ec 100644
--- a/substrate/frame/examples/offchain-worker/src/tests.rs
+++ b/substrate/frame/examples/offchain-worker/src/tests.rs
@@ -240,16 +240,7 @@ fn should_submit_signed_transaction_on_chain() {
 		let tx = pool_state.write().transactions.pop().unwrap();
 		assert!(pool_state.read().transactions.is_empty());
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
-		assert!(matches!(
-			tx.preamble,
-			sp_runtime::generic::Preamble::Signed(
-				0,
-				(),
-				0,
-				(),
-				sp_runtime::generic::EXTRINSIC_FORMAT_VERSION
-			)
-		));
+		assert!(matches!(tx.preamble, sp_runtime::generic::Preamble::Signed(0, (), 0, (),)));
 		assert_eq!(tx.function, RuntimeCall::Example(crate::Call::submit_price { price: 15523 }));
 	});
 }