diff --git a/execution/executor/src/block_executor/mod.rs b/execution/executor/src/block_executor/mod.rs
index 40c90751bcec7..9731c4d11f52e 100644
--- a/execution/executor/src/block_executor/mod.rs
+++ b/execution/executor/src/block_executor/mod.rs
@@ -42,7 +42,7 @@ use aptos_types::{
 };
 use aptos_vm::VMBlockExecutor;
 use block_tree::BlockTree;
-use fail::fail_point;
+// use fail::fail_point;
 use std::sync::Arc;
 
 pub mod block_tree;
@@ -232,11 +232,13 @@ where
 
                 let execution_output = {
                     let _timer = GET_BLOCK_EXECUTION_OUTPUT_BY_EXECUTING.start_timer();
+                    /*
                     fail_point!("executor::block_executor_execute_block", |_| {
                         Err(ExecutorError::from(anyhow::anyhow!(
                             "Injected error in block_executor_execute_block"
                         )))
                     });
+                     */
 
                     DoGetExecutionOutput::by_transaction_execution(
                         &self.block_executor,
@@ -250,9 +252,11 @@ where
                 let _timer = OTHER_TIMERS.timer_with(&["state_checkpoint"]);
 
                 let state_checkpoint_output = THREAD_MANAGER.get_exe_cpu_pool().install(|| {
+                    /*
                     fail_point!("executor::block_state_checkpoint", |_| {
                         Err(anyhow::anyhow!("Injected error in block state checkpoint."))
                     });
+                     */
                     DoStateCheckpoint::run(
                         &execution_output,
                         parent_output.expect_result_state(),
@@ -331,9 +335,11 @@ where
 
         let block = self.block_tree.get_block(block_id)?;
 
+        /*
         fail_point!("executor::pre_commit_block", |_| {
             Err(anyhow::anyhow!("Injected error in pre_commit_block.").into())
         });
+         */
 
         let output = block.output.expect_complete_result();
         let num_txns = output.num_transactions_to_commit();
@@ -369,9 +375,11 @@ where
         // Confirm the block to be committed is tracked in the tree.
         self.block_tree.get_block(block_id)?;
 
+        /*
         fail_point!("executor::commit_blocks", |_| {
             Err(anyhow::anyhow!("Injected error in commit_blocks.").into())
         });
+         */
 
         let target_version = ledger_info_with_sigs.ledger_info().version();
         self.db
diff --git a/testsuite/forge-cli/src/suites/realistic_environment.rs b/testsuite/forge-cli/src/suites/realistic_environment.rs
index dbb6a7351a9fd..2f767bec89960 100644
--- a/testsuite/forge-cli/src/suites/realistic_environment.rs
+++ b/testsuite/forge-cli/src/suites/realistic_environment.rs
@@ -179,7 +179,7 @@ pub(crate) fn realistic_env_fairness_workload_sweep() -> ForgeConfig {
         ]),
         criteria: Vec::new(),
         background_traffic: background_traffic_for_sweep_with_latency(
-            &[(2.0, 3.0, 8.0), (0.1, 25.0, 30.0), (0.1, 30.0, 40.0)],
+            &[(2.0, 3.0, 8.0), (0.1, 25.0, 30.0), (0.1, 30.0, 45.0)],
             false,
         ),
     })
@@ -217,8 +217,10 @@ pub(crate) fn realistic_env_graceful_workload_sweep() -> ForgeConfig {
                 (0.1, 2.2, 3.0),
                 (0.1, 3.5, 5.0),
                 (0.1, 4.0, 6.0),
-                (0.1, 2.5, 4.0),
-                (0.1, 3.5, 5.0),
+                // TODO - p50 and p90 is set to high, until it is calibrated/understood.
+                (0.1, 3.0, 5.0),
+                // TODO - p50 and p90 is set to high, until it is calibrated/understood.
+                (0.1, 5.0, 10.0),
                 // TODO - p50 and p90 is set to high, until it is calibrated/understood.
                 (0.1, 3.0, 10.0),
             ],
@@ -485,7 +487,7 @@ pub(crate) fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
             );
     } else {
         forge_config = forge_config.with_success_criteria(
-            SuccessCriteria::new(12000)
+            SuccessCriteria::new(11000)
                 .add_no_restarts()
                 /* This test runs at high load, so we need more catchup time */
                 .add_wait_for_catchup_s(120),