diff --git a/mysql-test/r/subselect_cache.result b/mysql-test/r/subselect_cache.result
index 71c4a4bc88c..374bb44e5c5 100644
--- a/mysql-test/r/subselect_cache.result
+++ b/mysql-test/r/subselect_cache.result
@@ -3199,7 +3199,7 @@ Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` where <expr_cache><`tes
 drop table t1,t2;
 set @@optimizer_switch= default;
 # LP BUG#615760 (part 2: incorrect heap table index flags)
-SET SESSION optimizer_switch = 'index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=on,table_elimination=off';
+SET SESSION optimizer_switch = 'index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=on';
 CREATE TABLE `t1` (
 `pk` int(11) NOT NULL AUTO_INCREMENT,
 `col_int_nokey` int(11) DEFAULT NULL,
diff --git a/mysql-test/t/subselect_cache.test b/mysql-test/t/subselect_cache.test
index 5340f5ead54..32099c51003 100644
--- a/mysql-test/t/subselect_cache.test
+++ b/mysql-test/t/subselect_cache.test
@@ -1489,7 +1489,7 @@ set @@optimizer_switch= default;
 #
 --echo # LP BUG#615760 (part 2: incorrect heap table index flags)
 #
-SET SESSION optimizer_switch = 'index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=on,table_elimination=off';
+SET SESSION optimizer_switch = 'index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=on';
 
 CREATE TABLE `t1` (
   `pk` int(11) NOT NULL AUTO_INCREMENT,