diff --git a/mysql-test/main/group_min_max.result b/mysql-test/main/group_min_max.result
index e1993eec07d..f2288211e8f 100644
--- a/mysql-test/main/group_min_max.result
+++ b/mysql-test/main/group_min_max.result
@@ -4238,30 +4238,6 @@ a	b	s1
 2	2	t2:t2a-null;min_t3_b:t3b-null
 3	3	t2:1;min_t3_b:3
 drop table t1,t2,t3;
-# 
-# MDEV-31380: Assertion `s->table->opt_range_condition_rows <= s->found_records' failed
-#  (assertion in 10.6+, DBL_MAX costs in 10.5)
-# 
-CREATE TABLE t1 (a INT, b INT, PRIMARY KEY(a), KEY(b)) ENGINE=InnoDB;
-INSERT INTO t1 SELECT seq, seq FROM seq_1_to_100;
-SET
-@tmp=@@optimizer_use_condition_selectivity,
-optimizer_use_condition_selectivity = 1,
-@tmp2=@@optimizer_trace,
-optimizer_trace=1;
-SELECT DISTINCT * FROM t1 WHERE a IN (1, 2);
-a	b
-1	1
-2	2
-select 
-CAST(json_value(json_extract(trace, '$**.chosen_access_method.cost'), '$[0]')
-as DOUBLE) < 1.0e100
-from information_schema.optimizer_trace;
-CAST(json_value(json_extract(trace, '$**.chosen_access_method.cost'), '$[0]')
-as DOUBLE) < 1.0e100
-1
-set optimizer_use_condition_selectivity = @tmp, optimizer_trace=@tmp2;
-drop table t1;
 #
 # End of 10.5 tests
 #
diff --git a/mysql-test/main/group_min_max.test b/mysql-test/main/group_min_max.test
index 9a0ca3041d3..41aac11c9ac 100644
--- a/mysql-test/main/group_min_max.test
+++ b/mysql-test/main/group_min_max.test
@@ -7,7 +7,7 @@
 --source include/default_optimizer_switch.inc
 --source include/have_sequence.inc
 --source include/have_innodb.inc
---source include/have_sequence.inc
+
 #
 # TODO:
 # Add queries with:
@@ -1867,30 +1867,6 @@ from t1;
 
 drop table t1,t2,t3;
 
---echo # 
---echo # MDEV-31380: Assertion `s->table->opt_range_condition_rows <= s->found_records' failed
---echo #  (assertion in 10.6+, DBL_MAX costs in 10.5)
---echo # 
-
-CREATE TABLE t1 (a INT, b INT, PRIMARY KEY(a), KEY(b)) ENGINE=InnoDB;
-INSERT INTO t1 SELECT seq, seq FROM seq_1_to_100;
-
-SET
-  @tmp=@@optimizer_use_condition_selectivity,
-  optimizer_use_condition_selectivity = 1,
-  @tmp2=@@optimizer_trace,
-  optimizer_trace=1;
-
-SELECT DISTINCT * FROM t1 WHERE a IN (1, 2);
-
-select 
-  CAST(json_value(json_extract(trace, '$**.chosen_access_method.cost'), '$[0]')
-       as DOUBLE) < 1.0e100
-from information_schema.optimizer_trace;
-
-set optimizer_use_condition_selectivity = @tmp, optimizer_trace=@tmp2;
-drop table t1;
-
 --echo #
 --echo # End of 10.5 tests
 --echo #