diff --git a/test/pylib/repair.py b/test/pylib/repair.py
index ca77adf382..73f8d15b1a 100644
--- a/test/pylib/repair.py
+++ b/test/pylib/repair.py
@@ -28,11 +28,13 @@ async def load_tablet_repair_time(cql, hosts, table_id):
 
     return repair_time_map
 
-async def create_table_insert_data_for_repair(manager, rf = 3 , tablets = 8, fast_stats_refresh = True, nr_keys = 256):
+async def create_table_insert_data_for_repair(manager, rf = 3 , tablets = 8, fast_stats_refresh = True, nr_keys = 256, disable_flush_cache_time = False):
     if fast_stats_refresh:
         config = {'error_injections_at_startup': ['short_tablet_stats_refresh_interval']}
     else:
         config = {}
+    if disable_flush_cache_time:
+        config.update({'repair_hints_batchlog_flush_cache_time_in_ms': 0})
     servers = [await manager.server_add(config=config), await manager.server_add(config=config), await manager.server_add(config=config)]
     cql = manager.get_cql()
     await cql.run_async("CREATE KEYSPACE test WITH replication = {{'class': 'NetworkTopologyStrategy', "
diff --git a/test/topology_custom/test_tablet_repair_scheduler.py b/test/topology_custom/test_tablet_repair_scheduler.py
index 63c2d17fb2..5ef98b6dfc 100644
--- a/test/topology_custom/test_tablet_repair_scheduler.py
+++ b/test/topology_custom/test_tablet_repair_scheduler.py
@@ -37,7 +37,7 @@ async def guarantee_repair_time_next_second():
 
 @pytest.mark.asyncio
 async def test_tablet_manual_repair(manager: ManagerClient):
-    servers, cql, hosts, table_id = await create_table_insert_data_for_repair(manager, fast_stats_refresh=False)
+    servers, cql, hosts, table_id = await create_table_insert_data_for_repair(manager, fast_stats_refresh=False, disable_flush_cache_time=True)
     token = -1
 
     start = time.time()
@@ -62,7 +62,7 @@ async def test_tablet_manual_repair(manager: ManagerClient):
 
 @pytest.mark.asyncio
 async def test_tablet_manual_repair_all_tokens(manager: ManagerClient):
-    servers, cql, hosts, table_id = await create_table_insert_data_for_repair(manager, fast_stats_refresh=False)
+    servers, cql, hosts, table_id = await create_table_insert_data_for_repair(manager, fast_stats_refresh=False, disable_flush_cache_time=True)
     token = "all"
     now = datetime.datetime.utcnow()
     map1 = await load_tablet_repair_time(cql, hosts[0:1], table_id)