diff --git a/tests/src/e2e/ibc_tests.rs b/tests/src/e2e/ibc_tests.rs
index dc028cfb4fa..f640cd00e76 100644
--- a/tests/src/e2e/ibc_tests.rs
+++ b/tests/src/e2e/ibc_tests.rs
@@ -178,10 +178,28 @@ fn setup_two_single_node_nets() -> Result<(Test, Test)> {
     // epoch per 100 seconds
     let update_genesis = |mut genesis: GenesisConfig| {
         genesis.parameters.epochs_per_year = 315_360;
+        *genesis
+            .token
+            .get_mut(NAM)
+            .unwrap()
+            .balances
+            .as_mut()
+            .unwrap()
+            .get_mut(ALBERT)
+            .unwrap() = 10000000;
         genesis
     };
     let update_genesis_b = |mut genesis: GenesisConfig| {
         genesis.parameters.epochs_per_year = 315_360;
+        *genesis
+            .token
+            .get_mut(NAM)
+            .unwrap()
+            .balances
+            .as_mut()
+            .unwrap()
+            .get_mut(ALBERT)
+            .unwrap() = 10000000;
         setup::set_validators(1, genesis, |_| setup::ANOTHER_CHAIN_PORT_OFFSET)
     };
     Ok((
@@ -766,7 +784,7 @@ fn transfer_received_token(
         "--amount",
         "50000",
         "--gas-limit",
-        "100",
+        "50",
         "--fee-token",
         NAM,
         "--node",
@@ -981,7 +999,7 @@ fn submit_ibc_tx(
             "--signer",
             signer,
             "--gas-limit",
-            "100",
+            "40",
             "--fee-token",
             NAM,
             "--node",
diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs
index d9c3ffe80b5..4a7e39217e4 100644
--- a/tests/src/e2e/ledger_tests.rs
+++ b/tests/src/e2e/ledger_tests.rs
@@ -384,7 +384,7 @@ fn ledger_txs_and_queries() -> Result<()> {
             "--amount",
             "10.1",
             "--gas-limit",
-            "100",
+            "40",
             "--node",
             &validator_one_rpc,
         ],
@@ -400,7 +400,7 @@ fn ledger_txs_and_queries() -> Result<()> {
             "--amount",
             "10.1",
             "--gas-limit",
-            "100",
+            "40",
             "--node",
             &validator_one_rpc,
         ],
@@ -413,7 +413,7 @@ fn ledger_txs_and_queries() -> Result<()> {
              "--code-path",
              VP_USER_WASM,
              "--gas-limit",
-             "100",
+             "40",
             "--node",
             &validator_one_rpc,
         ],
@@ -427,7 +427,7 @@ fn ledger_txs_and_queries() -> Result<()> {
             "--data-path",
             &tx_data_path,
             "--gas-limit",
-            "100",
+            "40",
             "--node",
             &validator_one_rpc
         ],
@@ -444,7 +444,7 @@ fn ledger_txs_and_queries() -> Result<()> {
             "--alias",
             "Test-Account",
             "--gas-limit",
-            "100",
+            "40",
             "--node",
             &validator_one_rpc,
         ],
@@ -464,7 +464,7 @@ fn ledger_txs_and_queries() -> Result<()> {
             "--signer",
             ALBERT,
             "--gas-limit",
-            "100",
+            "40",
             "--node",
             &validator_one_rpc,
         ],
@@ -581,25 +581,6 @@ fn wrapper_fee_unshielding() -> Result<()> {
     let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
 
     let txs_args = [
-        (
-            vec![
-                // 0. Remove some tokens from Albert's balance
-                "transfer",
-                "--source",
-                ALBERT,
-                "--target",
-                BERTHA,
-                "--token",
-                NAM,
-                "--amount",
-                "1",
-                "--gas-limit",
-                "30",
-                "--ledger-address",
-                &validator_one_rpc,
-            ],
-            "Transaction is valid",
-        ),
         (
             vec![
                 // 1. Shield some tokens
@@ -613,7 +594,7 @@ fn wrapper_fee_unshielding() -> Result<()> {
                 "--amount",
                 "50000",
                 "--gas-limit",
-                "100",
+                "40",
                 "--ledger-address",
                 &validator_one_rpc,
             ],
@@ -638,7 +619,7 @@ fn wrapper_fee_unshielding() -> Result<()> {
                 "--ledger-address",
                 &validator_one_rpc,
             ],
-            "Error in fee unshielding",
+            "Insufficient transparent balance",
         ),
         // 3. Valid unshielding
         (
@@ -653,7 +634,7 @@ fn wrapper_fee_unshielding() -> Result<()> {
                 "--amount",
                 "1",
                 "--gas-limit",
-                "1",
+                "40",
                 "--fee-spending-key",
                 A_SPENDING_KEY,
                 "--ledger-address",
@@ -1217,7 +1198,7 @@ fn masp_incentives() -> Result<()> {
             "--amount",
             "20",
             "--gas-limit",
-            "100",
+            "40",
             "--node",
             &validator_one_rpc
         ],
@@ -1411,7 +1392,7 @@ fn masp_incentives() -> Result<()> {
             "--amount",
             "30",
             "--gas-limit",
-            "100",
+            "40",
             "--node",
             &validator_one_rpc
         ],
@@ -1541,7 +1522,7 @@ fn masp_incentives() -> Result<()> {
             "--signer",
             BERTHA,
             "--gas-limit",
-            "150",
+            "40",
             "--node",
             &validator_one_rpc
         ],
@@ -1635,7 +1616,7 @@ fn masp_incentives() -> Result<()> {
             "--signer",
             ALBERT,
             "--gas-limit",
-            "150",
+            "40",
             "--node",
             &validator_one_rpc
         ],
@@ -1795,7 +1776,7 @@ fn masp_incentives() -> Result<()> {
             "--signer",
             BERTHA,
             "--gas-limit",
-            "150",
+            "40",
             "--node",
             &validator_one_rpc
         ],
@@ -1824,7 +1805,7 @@ fn masp_incentives() -> Result<()> {
             "--signer",
             ALBERT,
             "--gas-limit",
-            "100",
+            "40",
             "--node",
             &validator_one_rpc
         ],
@@ -2780,7 +2761,7 @@ fn proposal_submission() -> Result<()> {
         "--amount",
         "900",
         "--gas-limit",
-        "100",
+        "40",
         "--node",
         &validator_one_rpc,
     ];
@@ -2807,7 +2788,7 @@ fn proposal_submission() -> Result<()> {
         "--data-path",
         valid_proposal_json_path.to_str().unwrap(),
         "--gas-limit",
-        "100",
+        "40",
         "--node",
         &validator_one_rpc,
     ];
@@ -2910,7 +2891,7 @@ fn proposal_submission() -> Result<()> {
         "--data-path",
         invalid_proposal_json_path.to_str().unwrap(),
         "--gas-limit",
-        "100",
+        "40",
         "--node",
         &validator_one_rpc,
     ];
@@ -2966,7 +2947,7 @@ fn proposal_submission() -> Result<()> {
         "--signer",
         "validator-0",
         "--gas-limit",
-        "100",
+        "40",
         "--node",
         &validator_one_rpc,
     ];
@@ -2990,7 +2971,7 @@ fn proposal_submission() -> Result<()> {
         "--signer",
         BERTHA,
         "--gas-limit",
-        "100",
+        "40",
         "--node",
         &validator_one_rpc,
     ];
@@ -3010,7 +2991,7 @@ fn proposal_submission() -> Result<()> {
         "--signer",
         ALBERT,
         "--gas-limit",
-        "100",
+        "40",
         "--node",
         &validator_one_rpc,
     ];
@@ -3366,7 +3347,7 @@ fn pgf_governance_proposal() -> Result<()> {
         "--amount",
         "900",
         "--gas-limit",
-        "150",
+        "40",
         "--ledger-address",
         &validator_one_rpc,
     ];
@@ -3385,7 +3366,7 @@ fn pgf_governance_proposal() -> Result<()> {
         "--data-path",
         valid_proposal_json_path.to_str().unwrap(),
         "--gas-limit",
-        "150",
+        "40",
         "--ledger-address",
         &validator_one_rpc,
     ];
@@ -3403,7 +3384,7 @@ fn pgf_governance_proposal() -> Result<()> {
         "--data-path",
         valid_proposal_json_path.to_str().unwrap(),
         "--gas-limit",
-        "150",
+        "40",
         "--ledger-address",
         &validator_one_rpc,
     ];
@@ -3487,7 +3468,7 @@ fn pgf_governance_proposal() -> Result<()> {
         "--signer",
         "validator-0",
         "--gas-limit",
-        "150",
+        "40",
         "--ledger-address",
         &validator_one_rpc,
     ];
@@ -3515,7 +3496,7 @@ fn pgf_governance_proposal() -> Result<()> {
         "--signer",
         BERTHA,
         "--gas-limit",
-        "150",
+        "40",
         "--ledger-address",
         &validator_one_rpc,
     ];
@@ -3536,7 +3517,7 @@ fn pgf_governance_proposal() -> Result<()> {
         "--signer",
         BERTHA,
         "--gas-limit",
-        "150",
+        "40",
         "--ledger-address",
         &validator_one_rpc,
     ];