diff --git a/mysql-test/r/temp_table_frm.result b/mysql-test/r/temp_table_frm.result
index ff809957a3d..4f60ccc32c8 100644
--- a/mysql-test/r/temp_table_frm.result
+++ b/mysql-test/r/temp_table_frm.result
@@ -1,3 +1,4 @@
+set @@session.max_heap_table_size=16*1024*1024;
 create table t1 select * from information_schema.session_status where variable_name like 'Opened%';
 create temporary table t2 (a int) engine=memory;
 select variable_name, session_status.variable_value - t1.variable_value
diff --git a/mysql-test/t/temp_table_frm.test b/mysql-test/t/temp_table_frm.test
index f78de71a756..178bd15004b 100644
--- a/mysql-test/t/temp_table_frm.test
+++ b/mysql-test/t/temp_table_frm.test
@@ -1,6 +1,9 @@
 #
 # MDEV-4260 Don't create frm files for temporary tables
 #
+
+# Ensure we don't overflow the internal heap table size in the join
+set @@session.max_heap_table_size=16*1024*1024;
 create table t1 select * from information_schema.session_status where variable_name like 'Opened%';
 create temporary table t2 (a int) engine=memory;
 select variable_name, session_status.variable_value - t1.variable_value