diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index df499fa..2bc7c29 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -303,6 +303,7 @@ jobs:
         BINSRV=${{github.workspace}}/src-build-${{matrix.config.label}}/binlog_server ./mtr \
           --vardir=${{runner.temp}}/mtrvardir80 \
           --force --max-test-fail=0 --retry=0 --nounit-tests --big-test --repeat=2 --parallel=${{steps.cpu-cores.outputs.count}} \
+          --testcase-timeout=30 --suite-timeout=60 --shutdown-timeout=600 \
           --suite=binlog_streaming ${{matrix.config.mtr_options}}
 
     - name: MTR 8.4 tests
@@ -312,6 +313,7 @@ jobs:
         BINSRV=${{github.workspace}}/src-build-${{matrix.config.label}}/binlog_server ./mtr \
           --vardir=${{runner.temp}}/mtrvardir84 \
           --force --max-test-fail=0 --retry=0 --nounit-tests --big-test --repeat=2 --parallel=${{steps.cpu-cores.outputs.count}} \
+          --testcase-timeout=30 --suite-timeout=60 --shutdown-timeout=600 \
           --suite=binlog_streaming ${{matrix.config.mtr_options}}
 
     - name: CTest
diff --git a/mtr/binlog_streaming/t/data_directory_8_0_to_8_4_upgrade.test b/mtr/binlog_streaming/t/data_directory_8_0_to_8_4_upgrade.test
index 71280da..153181d 100644
--- a/mtr/binlog_streaming/t/data_directory_8_0_to_8_4_upgrade.test
+++ b/mtr/binlog_streaming/t/data_directory_8_0_to_8_4_upgrade.test
@@ -42,7 +42,7 @@ if ($lts_series != v84)
 --echo *** Running 8.4 binaries on a 8.0 data directory
 --let $MYSQLD_LOG = $MYSQLTEST_VARDIR/log/upgrade.log
 --let $do_not_echo_parameters = 1
---let $restart_parameters = restart: --datadir=$CUSTOM_MYSQLD_DATADIR --log-error=$MYSQLD_LOG
+--let $restart_parameters = restart: --datadir=$CUSTOM_MYSQLD_DATADIR --log-error=$MYSQLD_LOG --binlog_expire_logs_auto_purge=OFF
 --source include/start_mysqld.inc
 
 --echo