diff --git a/testing/integration-tests/src/full_client/blocks/mod.rs b/testing/integration-tests/src/full_client/blocks/mod.rs
index b4090a2e00..d0ef601a38 100644
--- a/testing/integration-tests/src/full_client/blocks/mod.rs
+++ b/testing/integration-tests/src/full_client/blocks/mod.rs
@@ -25,7 +25,7 @@ use subxt_signer::sr25519::dev;
 use subxt_metadata::Metadata;
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn block_subscriptions_are_consistent_with_eachother() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -89,7 +89,7 @@ async fn block_subscriptions_are_consistent_with_eachother() -> Result<(), subxt
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn finalized_headers_subscription() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -106,7 +106,7 @@ async fn finalized_headers_subscription() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn missing_block_headers_will_be_filled_in() -> Result<(), subxt::Error> {
     use subxt::backend::legacy;
 
@@ -151,7 +151,7 @@ async fn missing_block_headers_will_be_filled_in() -> Result<(), subxt::Error> {
 }
 
 // Check that we can subscribe to non-finalized blocks.
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn runtime_api_call() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -177,7 +177,7 @@ async fn runtime_api_call() -> Result<(), subxt::Error> {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn fetch_block_and_decode_extrinsic_details() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -247,7 +247,7 @@ async fn fetch_block_and_decode_extrinsic_details() {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn decode_signed_extensions_from_blocks() {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/client/legacy_rpcs.rs b/testing/integration-tests/src/full_client/client/legacy_rpcs.rs
index 7a33d9feb2..cd932146fc 100644
--- a/testing/integration-tests/src/full_client/client/legacy_rpcs.rs
+++ b/testing/integration-tests/src/full_client/client/legacy_rpcs.rs
@@ -7,7 +7,7 @@
 
 use crate::{subxt_test, test_context};
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chain_get_block_hash() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -15,7 +15,7 @@ async fn chain_get_block_hash() {
     rpc.chain_get_block_hash(None).await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chain_get_block() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -24,7 +24,7 @@ async fn chain_get_block() {
     rpc.chain_get_block(hash).await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chain_get_finalized_head() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -32,7 +32,7 @@ async fn chain_get_finalized_head() {
     rpc.chain_get_finalized_head().await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chain_subscribe_all_heads() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -41,7 +41,7 @@ async fn chain_subscribe_all_heads() {
     let _block_header = sub.next().await.unwrap().unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chain_subscribe_finalized_heads() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -50,7 +50,7 @@ async fn chain_subscribe_finalized_heads() {
     let _block_header = sub.next().await.unwrap().unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chain_subscribe_new_heads() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -59,7 +59,7 @@ async fn chain_subscribe_new_heads() {
     let _block_header = sub.next().await.unwrap().unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn genesis_hash() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -67,7 +67,7 @@ async fn genesis_hash() {
     let _genesis_hash = rpc.genesis_hash().await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn state_get_metadata() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -75,7 +75,7 @@ async fn state_get_metadata() {
     let _metadata = rpc.state_get_metadata(None).await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn state_call() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -86,7 +86,7 @@ async fn state_call() {
         .unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn system_health() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -94,7 +94,7 @@ async fn system_health() {
     let _ = rpc.system_health().await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn system_chain() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -102,7 +102,7 @@ async fn system_chain() {
     let _ = rpc.system_chain().await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn system_name() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -110,7 +110,7 @@ async fn system_name() {
     let _ = rpc.system_name().await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn system_version() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
@@ -118,7 +118,7 @@ async fn system_version() {
     let _ = rpc.system_version().await.unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn system_properties() {
     let ctx = test_context().await;
     let rpc = ctx.legacy_rpc_methods().await;
diff --git a/testing/integration-tests/src/full_client/client/mod.rs b/testing/integration-tests/src/full_client/client/mod.rs
index 8a4d66aafc..246191a280 100644
--- a/testing/integration-tests/src/full_client/client/mod.rs
+++ b/testing/integration-tests/src/full_client/client/mod.rs
@@ -27,7 +27,7 @@ mod legacy_rpcs;
 mod unstable_rpcs;
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_fetch_raw_keys() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -49,7 +49,7 @@ async fn storage_fetch_raw_keys() {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_iter() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -74,7 +74,7 @@ async fn storage_iter() {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_child_values_same_across_backends() {
     let ctx = test_context().await;
 
@@ -114,7 +114,7 @@ async fn storage_child_values_same_across_backends() {
     }
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn transaction_validation() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -144,7 +144,7 @@ async fn transaction_validation() {
         .unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn validation_fails() {
     use std::str::FromStr;
     use subxt_signer::{sr25519::Keypair, SecretUri};
@@ -178,7 +178,7 @@ async fn validation_fails() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn external_signing() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -211,7 +211,7 @@ async fn external_signing() {
 // TODO: Investigate and fix this test failure when using the UnstableBackend.
 // (https://github.com/paritytech/subxt/issues/1308)
 #[cfg(not(feature = "unstable-backend-client"))]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn submit_large_extrinsic() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -238,7 +238,7 @@ async fn submit_large_extrinsic() {
         .unwrap();
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn decode_a_module_error() {
     use node_runtime::runtime_types::pallet_assets::pallet as assets;
 
@@ -276,7 +276,7 @@ async fn decode_a_module_error() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn unsigned_extrinsic_is_same_shape_as_polkadotjs() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -304,7 +304,7 @@ async fn unsigned_extrinsic_is_same_shape_as_polkadotjs() {
     assert_eq!(actual_tx_bytes, expected_tx_bytes);
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn extrinsic_hash_is_same_as_returned() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -356,7 +356,7 @@ pub struct InclusionFee {
     pub adjusted_weight_fee: u128,
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn partial_fee_estimate_correct() {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/client/unstable_rpcs.rs b/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
index 5267ce50f0..1cf65473f2 100644
--- a/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
+++ b/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
@@ -22,7 +22,7 @@ use subxt::client::OfflineClientT;
 
 use subxt_signer::sr25519::dev;
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainhead_unstable_follow() {
     let ctx = test_context().await;
     let rpc = ctx.unstable_rpc_methods().await;
@@ -62,7 +62,7 @@ async fn chainhead_unstable_follow() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainhead_unstable_body() {
     let ctx = test_context().await;
     let rpc = ctx.unstable_rpc_methods().await;
@@ -90,7 +90,7 @@ async fn chainhead_unstable_body() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainhead_unstable_header() {
     let ctx = test_context().await;
     let rpc = ctx.unstable_rpc_methods().await;
@@ -118,7 +118,7 @@ async fn chainhead_unstable_header() {
     assert_eq!(new_header, old_header);
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainhead_unstable_storage() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -164,7 +164,7 @@ async fn chainhead_unstable_storage() {
     assert_matches!(event, FollowEvent::OperationStorageDone(res) if res.operation_id == operation_id);
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainhead_unstable_call() {
     let ctx = test_context().await;
     let rpc = ctx.unstable_rpc_methods().await;
@@ -201,7 +201,7 @@ async fn chainhead_unstable_call() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainhead_unstable_unpin() {
     let ctx = test_context().await;
     let rpc = ctx.unstable_rpc_methods().await;
@@ -220,7 +220,7 @@ async fn chainhead_unstable_unpin() {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainspec_v1_genesishash() {
     let ctx = test_context().await;
     let old_rpc = ctx.legacy_rpc_methods().await;
@@ -233,7 +233,7 @@ async fn chainspec_v1_genesishash() {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainspec_v1_chainname() {
     let ctx = test_context().await;
     let old_rpc = ctx.legacy_rpc_methods().await;
@@ -246,7 +246,7 @@ async fn chainspec_v1_chainname() {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chainspec_v1_properties() {
     let ctx = test_context().await;
     let old_rpc = ctx.legacy_rpc_methods().await;
@@ -259,7 +259,7 @@ async fn chainspec_v1_properties() {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn transaction_unstable_submit_and_watch() {
     let ctx = test_context().await;
     let rpc = ctx.unstable_rpc_methods().await;
diff --git a/testing/integration-tests/src/full_client/frame/balances.rs b/testing/integration-tests/src/full_client/frame/balances.rs
index d5df7805fb..52d9fab7b3 100644
--- a/testing/integration-tests/src/full_client/frame/balances.rs
+++ b/testing/integration-tests/src/full_client/frame/balances.rs
@@ -16,7 +16,7 @@ use subxt_signer::sr25519::dev;
 #[cfg(lightclient)]
 use subxt::client::OfflineClientT;
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn tx_basic_transfer() -> Result<(), subxt::Error> {
     let alice = dev::alice();
     let bob = dev::bob();
@@ -89,7 +89,7 @@ async fn tx_basic_transfer() -> Result<(), subxt::Error> {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn tx_dynamic_transfer() -> Result<(), subxt::Error> {
     use subxt::ext::scale_value::{At, Composite, Value};
 
@@ -211,7 +211,7 @@ async fn tx_dynamic_transfer() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn multiple_sequential_transfers_work() -> Result<(), subxt::Error> {
     let alice = dev::alice();
     let bob = dev::bob();
@@ -255,7 +255,7 @@ async fn multiple_sequential_transfers_work() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_total_issuance() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -272,7 +272,7 @@ async fn storage_total_issuance() {
     assert_ne!(total_issuance, 0);
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_balance_lock() -> Result<(), subxt::Error> {
     let bob_signer = dev::bob();
     let bob: AccountId32 = dev::bob().public_key().into();
@@ -314,7 +314,7 @@ async fn storage_balance_lock() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn transfer_error() {
     let alice = dev::alice();
     let alice_addr = alice.public_key().into();
@@ -360,7 +360,7 @@ async fn transfer_error() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn transfer_implicit_subscription() {
     let alice = dev::alice();
     let bob: AccountId32 = dev::bob().public_key().into();
@@ -394,7 +394,7 @@ async fn transfer_implicit_subscription() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn constant_existential_deposit() {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/frame/contracts.rs b/testing/integration-tests/src/full_client/frame/contracts.rs
index 8642eaa267..3bad5a29b8 100644
--- a/testing/integration-tests/src/full_client/frame/contracts.rs
+++ b/testing/integration-tests/src/full_client/frame/contracts.rs
@@ -169,7 +169,7 @@ impl ContractsTestContext {
     }
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn tx_instantiate_with_code() {
     let ctx = ContractsTestContext::init().await;
     let result = ctx.instantiate_with_code().await;
@@ -180,7 +180,7 @@ async fn tx_instantiate_with_code() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn tx_instantiate() {
     let ctx = ContractsTestContext::init().await;
     let code_hash = ctx.upload_code().await.unwrap();
@@ -193,7 +193,7 @@ async fn tx_instantiate() {
     );
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn tx_call() {
     let cxt = ContractsTestContext::init().await;
     let (_, contract) = cxt.instantiate_with_code().await.unwrap();
diff --git a/testing/integration-tests/src/full_client/frame/staking.rs b/testing/integration-tests/src/full_client/frame/staking.rs
index 95a8ddee35..40a36bc271 100644
--- a/testing/integration-tests/src/full_client/frame/staking.rs
+++ b/testing/integration-tests/src/full_client/frame/staking.rs
@@ -34,7 +34,7 @@ fn default_validator_prefs() -> ValidatorPrefs {
     }
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn validate_with_stash_account() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -55,7 +55,7 @@ async fn validate_with_stash_account() {
         .expect("should be successful");
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn validate_not_possible_for_controller_account() -> Result<(), Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -80,7 +80,7 @@ async fn validate_not_possible_for_controller_account() -> Result<(), Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn nominate_with_stash_account() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -102,7 +102,7 @@ async fn nominate_with_stash_account() {
         .expect("should be successful");
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn nominate_not_possible_for_controller_account() -> Result<(), Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -129,7 +129,7 @@ async fn nominate_not_possible_for_controller_account() -> Result<(), Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn chill_works_for_stash_only() -> Result<(), Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -188,7 +188,7 @@ async fn chill_works_for_stash_only() -> Result<(), Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn tx_bond() -> Result<(), Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -221,7 +221,7 @@ async fn tx_bond() -> Result<(), Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_history_depth() -> Result<(), Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -231,7 +231,7 @@ async fn storage_history_depth() -> Result<(), Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_current_era() -> Result<(), Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -246,7 +246,7 @@ async fn storage_current_era() -> Result<(), Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_era_reward_points() -> Result<(), Error> {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/frame/sudo.rs b/testing/integration-tests/src/full_client/frame/sudo.rs
index 27a9b4e639..5118b3013b 100644
--- a/testing/integration-tests/src/full_client/frame/sudo.rs
+++ b/testing/integration-tests/src/full_client/frame/sudo.rs
@@ -15,7 +15,7 @@ use subxt_signer::sr25519::dev;
 type Call = runtime_types::kitchensink_runtime::RuntimeCall;
 type BalancesCall = runtime_types::pallet_balances::pallet::Call;
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn test_sudo() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -42,7 +42,7 @@ async fn test_sudo() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn test_sudo_unchecked_weight() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/frame/system.rs b/testing/integration-tests/src/full_client/frame/system.rs
index 0876feeb96..3ec5432b6b 100644
--- a/testing/integration-tests/src/full_client/frame/system.rs
+++ b/testing/integration-tests/src/full_client/frame/system.rs
@@ -9,7 +9,7 @@ use crate::{
 use assert_matches::assert_matches;
 use subxt_signer::sr25519::dev;
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_account() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -31,7 +31,7 @@ async fn storage_account() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn tx_remark_with_event() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/frame/timestamp.rs b/testing/integration-tests/src/full_client/frame/timestamp.rs
index 7df9345fab..5d74801434 100644
--- a/testing/integration-tests/src/full_client/frame/timestamp.rs
+++ b/testing/integration-tests/src/full_client/frame/timestamp.rs
@@ -4,7 +4,7 @@
 
 use crate::{node_runtime, subxt_test, test_context};
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_get_current_timestamp() {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/metadata/validation.rs b/testing/integration-tests/src/full_client/metadata/validation.rs
index 253720a652..4b3e531efd 100644
--- a/testing/integration-tests/src/full_client/metadata/validation.rs
+++ b/testing/integration-tests/src/full_client/metadata/validation.rs
@@ -100,7 +100,7 @@ fn pallets_to_metadata(pallets: Vec<PalletMetadata>) -> Metadata {
     ))
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn full_metadata_check() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -117,7 +117,7 @@ async fn full_metadata_check() {
     assert!(!node_runtime::is_codegen_valid_for(&metadata));
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn constant_values_are_not_validated() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -149,7 +149,7 @@ async fn constant_values_are_not_validated() {
     assert!(api.constants().at(&deposit_addr).is_ok());
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn calls_check() {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -235,7 +235,7 @@ async fn calls_check() {
     assert!(api.tx().validate(&withdraw_unbonded_addr).is_ok());
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_check() {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/runtime_api/mod.rs b/testing/integration-tests/src/full_client/runtime_api/mod.rs
index 9c766aaeda..fbd4370a4b 100644
--- a/testing/integration-tests/src/full_client/runtime_api/mod.rs
+++ b/testing/integration-tests/src/full_client/runtime_api/mod.rs
@@ -7,7 +7,7 @@ use codec::Encode;
 use subxt::utils::AccountId32;
 use subxt_signer::sr25519::dev;
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn account_nonce() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -49,7 +49,7 @@ async fn account_nonce() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn unchecked_extrinsic_encoding() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
diff --git a/testing/integration-tests/src/full_client/storage/mod.rs b/testing/integration-tests/src/full_client/storage/mod.rs
index d52bdd5f2a..cf05042683 100644
--- a/testing/integration-tests/src/full_client/storage/mod.rs
+++ b/testing/integration-tests/src/full_client/storage/mod.rs
@@ -9,7 +9,7 @@ use subxt::utils::AccountId32;
 #[cfg(fullclient)]
 use subxt_signer::sr25519::dev;
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_plain_lookup() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -31,7 +31,7 @@ async fn storage_plain_lookup() -> Result<(), subxt::Error> {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_map_lookup() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -65,7 +65,7 @@ async fn storage_map_lookup() -> Result<(), subxt::Error> {
 // treated as a StorageKey (ie we should hash both values together with one hasher, rather
 // than hash both values separately, or ignore the second value).
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_n_mapish_key_is_properly_created() -> Result<(), subxt::Error> {
     use codec::Encode;
     use node_runtime::runtime_types::sp_core::crypto::KeyTypeId;
@@ -96,7 +96,7 @@ async fn storage_n_mapish_key_is_properly_created() -> Result<(), subxt::Error>
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_n_map_storage_lookup() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -133,7 +133,7 @@ async fn storage_n_map_storage_lookup() -> Result<(), subxt::Error> {
 }
 
 #[cfg(fullclient)]
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_partial_lookup() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -206,7 +206,7 @@ async fn storage_partial_lookup() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_runtime_wasm_code() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();
@@ -215,7 +215,7 @@ async fn storage_runtime_wasm_code() -> Result<(), subxt::Error> {
     Ok(())
 }
 
-#[subxt_test(timeout = 800)]
+#[subxt_test]
 async fn storage_pallet_storage_version() -> Result<(), subxt::Error> {
     let ctx = test_context().await;
     let api = ctx.client();