diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 7cac610f88d..a35693eb93e 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1432,7 +1432,7 @@ thread-pool-idle-timeout 60
 thread-pool-max-threads 1000
 thread-pool-oversubscribe 3
 thread-pool-stall-limit 500
-thread-stack 295936
+thread-stack 296960
 time-format %H:%i:%s
 timed-mutexes FALSE
 tmp-table-size 16777216
diff --git a/mysql-test/suite/perfschema/t/threads_mysql-master.opt b/mysql-test/suite/perfschema/t/threads_mysql-master.opt
index f93413a61e5..00efa80d41e 100644
--- a/mysql-test/suite/perfschema/t/threads_mysql-master.opt
+++ b/mysql-test/suite/perfschema/t/threads_mysql-master.opt
@@ -1 +1 @@
---event-scheduler
+--event-scheduler --thread-cache-size=0
diff --git a/mysql-test/suite/sys_vars/t/thread_cache_size_func-master.opt b/mysql-test/suite/sys_vars/t/thread_cache_size_func-master.opt
new file mode 100644
index 00000000000..b8c19e1b5ff
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/thread_cache_size_func-master.opt
@@ -0,0 +1 @@
+--thread-cache-size=0