diff --git a/mysql8.4.spec b/mysql8.4.spec
index c27856a..569662a 100644
--- a/mysql8.4.spec
+++ b/mysql8.4.spec
@@ -761,18 +761,13 @@ pushd %_vpath_builddir
 pushd mysql-test
 cp ../../mysql-test/%{skiplist} .
 
-# Builds might happen at the same host, avoid collision
-#   The port used is calculated as 10 * MTR_BUILD_THREAD + 10000
-#   The resulting port must be between 5000 and 32767
-export MTR_BUILD_THREAD=$(( $(date +%s) % 2200 ))
-
 (
   set -ex
   cd %{buildroot}%{_datadir}/mysql-test
 
   export common_testsuite_arguments=" %{?with_debug:--debug-server} \
                                      --force --skip-combinations --report-unstable-tests --clean-vardir --nocheck-testcases \
-                                     --suite-timeout=900 --testcase-timeout=30 \
+                                     --suite-timeout=900 --testcase-timeout=30 --port-base=$(( $(date +%s) % 20000 + 10000 )) \
                                      --parallel=auto --retry=3 --max-test-fail=30 "
 
   # If full testsuite has already been run on this version and we don't explicitly want the full testsuite to be run