diff --git a/mysql-test/suite/perfschema/t/max_program_zero.test b/mysql-test/suite/perfschema/t/max_program_zero.test
index 064ba2ae2d9..7cbe95c1c0c 100644
--- a/mysql-test/suite/perfschema/t/max_program_zero.test
+++ b/mysql-test/suite/perfschema/t/max_program_zero.test
@@ -11,6 +11,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/not_msan_with_debug.inc
 
 --source ../include/start_server_common.inc
 
diff --git a/mysql-test/suite/perfschema/t/statement_program_lost_inst.test b/mysql-test/suite/perfschema/t/statement_program_lost_inst.test
index 0742043bba3..321bb649daf 100644
--- a/mysql-test/suite/perfschema/t/statement_program_lost_inst.test
+++ b/mysql-test/suite/perfschema/t/statement_program_lost_inst.test
@@ -22,7 +22,7 @@ let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 --write_line wait $restart_file
 --shutdown_server 
 --source include/wait_until_disconnected.inc
---write_line "restart:--performance_schema_max_program_instances=7 --performance_schema_max_statement_stack=2 --thread_stack=655360" $restart_file
+--write_line "restart:--performance_schema_max_program_instances=7 --performance_schema_max_statement_stack=2 --thread_stack=1048576" $restart_file
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
diff --git a/mysql-test/suite/perfschema/t/statement_program_nested.test b/mysql-test/suite/perfschema/t/statement_program_nested.test
index 183e9858226..75218359314 100644
--- a/mysql-test/suite/perfschema/t/statement_program_nested.test
+++ b/mysql-test/suite/perfschema/t/statement_program_nested.test
@@ -5,6 +5,7 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 --source include/have_innodb.inc
+--source include/not_msan_with_debug.inc
 
 TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
 TRUNCATE TABLE performance_schema.events_statements_history_long;
diff --git a/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test b/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test
index 73829be8b42..31368b9f7d6 100644
--- a/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test
+++ b/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test
@@ -8,6 +8,7 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 --source include/have_innodb.inc
+--source include/not_msan_with_debug.inc
 
 TRUNCATE TABLE performance_schema.events_statements_history_long;
 
diff --git a/sql/sql_const.h b/sql/sql_const.h
index 354d942e160..bee1a56d784 100644
--- a/sql/sql_const.h
+++ b/sql/sql_const.h
@@ -167,7 +167,14 @@
   Feel free to raise this by the smallest amount you can to get the
   "execution_constants" test to pass.
 */
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+#if defined(__clang__) && __has_feature(memory_sanitizer) && !defined(DBUG_OFF)
+#define STACK_MIN_SIZE          44000
+#else
 #define STACK_MIN_SIZE          16000   // Abort if less stack during eval.
+#endif
 
 #define STACK_MIN_SIZE_FOR_OPEN (1024*80)
 #define STACK_BUFF_ALLOC        352     ///< For stack overrun checks