diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 3280c02b6d3..d7930610ba5 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -496,7 +496,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
               add_custom_executable(upgrade_${oldver}_${p_or_s}_${size} ${test} ${base})
               add_test(
                 NAME ydb/${test}/upgrade/${oldver}/${p_or_s}/${size}
-                COMMAND ${CMAKE_CFG_INTDIR}/run_upgrade_stress_test.sh $<TARGET_FILE:upgrade_${oldver}_${p_or_s}_${size}_${test}> ${TOKU_SVNROOT}/tokudb.data/old-stress-test-envs/${oldver}/saved${p_or_s}-${size}-dir dir.upgrade_${oldver}_${p_or_s}_${size}_${base}.tdb ${size} 600)
+                COMMAND ${CMAKE_CFG_INTDIR}/run_upgrade_stress_test.sh $<TARGET_FILE:upgrade_${oldver}_${p_or_s}_${size}_${test}> ${TOKU_SVNROOT}/tokudb.data/old-stress-test-envs/${oldver}/saved${p_or_s}-${size}-dir dir.upgrade_${oldver}_${p_or_s}_${size}_${base}.tdb ${size} 600 7200)
               set_tests_properties(ydb/${test}/upgrade/${oldver}/${p_or_s}/${size} PROPERTIES TIMEOUT 10800)
             endforeach(size)
           endif ()
diff --git a/src/tests/run_upgrade_stress_test.sh b/src/tests/run_upgrade_stress_test.sh
index ee50c63f2d6..fb368ab8993 100755
--- a/src/tests/run_upgrade_stress_test.sh
+++ b/src/tests/run_upgrade_stress_test.sh
@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 
-if [[ $# -lt 5 ]]; then exit 1; fi
+if [[ $# -lt 6 ]]; then exit 1; fi
 
 bin=$1; shift
 saveddir=$1; shift
 envdir=$1; shift
 size=$1; shift
 time=$1; shift
+jointime=$1; shift
 
 rm -rf $envdir
 cp -r $saveddir $envdir
-$bin --only_stress --num_elements $size --num_seconds $time
+$bin --only_stress --num_elements $size --num_seconds $time --join_timeout $jointime