diff --git a/client/tests/integration/upgrade.rs b/client/tests/integration/upgrade.rs
index 85018e06a4a..19a2c6bff75 100644
--- a/client/tests/integration/upgrade.rs
+++ b/client/tests/integration/upgrade.rs
@@ -1,4 +1,5 @@
 use std::{path::Path, str::FromStr as _};
+use std::time::Duration;
 
 use eyre::Result;
 use futures_util::TryStreamExt as _;
@@ -251,6 +252,10 @@ fn executor_custom_instructions_complex() -> Result<()> {
     // But it will be needed after NewParameter removal in #4597
     config.chain_wide.executor_runtime.fuel_limit = 1_000_000_000;
 
+    // This is attempt to make test not flaky (it passes locally but fails on CI)
+    config.network.idle_timeout = Duration::from_secs(3600);
+    config.live_query_store.idle_time = Duration::from_secs(3600);
+
     let (_rt, _peer, client) = PeerBuilder::new()
         .with_port(11_185)
         .with_config(config)