diff --git a/mysql-test/include/rowid_filter_debug_kill.inc b/mysql-test/include/rowid_filter_debug_kill.inc
index c701d206297..513efed8a4c 100644
--- a/mysql-test/include/rowid_filter_debug_kill.inc
+++ b/mysql-test/include/rowid_filter_debug_kill.inc
@@ -1,17 +1,14 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/have_sequence.inc
 --source include/count_sessions.inc
 
 --echo #
 --echo # MDEV-22761 KILL QUERY during rowid_filter, crashes
 --echo #
 
-create table t0(a int);
-insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-
-# 100 rows 
 create table t2(a int);
-insert into t2 select A.a + B.a* 10 from t0 A, t0 B;
+insert into t2 select * from seq_0_to_99;
 
 # 10K rows 
 CREATE TABLE t3 (
@@ -26,11 +23,10 @@ where table_schema=database() and table_name='t3';
 
 insert into t3
 select
-  A.a,
-  B.a,
+  A.seq,
+  B.seq,
   'filler-data-filler-data'
-from
-  t2 A, t2 B;
+from seq_0_to_99 A, seq_0_to_99 B;
 
 analyze table t2,t3;
 
@@ -48,7 +44,6 @@ where
   t3.key1=t2.a and t3.key2 in (2,3);
 
 connect (con1, localhost, root,,);
-connection con1;
 set debug_sync='now WAIT_FOR at_rowid_filter_check';
 evalp kill query $target_id;
 set debug_sync='now SIGNAL go';
@@ -60,6 +55,5 @@ disconnect con1;
 reap;
 set debug_sync='RESET';
 
-drop table t0,t2,t3;
+drop table t2,t3;
 --source include/wait_until_count_sessions.inc
-
diff --git a/mysql-test/main/rowid_filter_innodb_debug.result b/mysql-test/main/rowid_filter_innodb_debug.result
index f989e00919b..7741a949e7d 100644
--- a/mysql-test/main/rowid_filter_innodb_debug.result
+++ b/mysql-test/main/rowid_filter_innodb_debug.result
@@ -2,10 +2,8 @@ set default_storage_engine=innodb;
 #
 # MDEV-22761 KILL QUERY during rowid_filter, crashes
 #
-create table t0(a int);
-insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2(a int);
-insert into t2 select A.a + B.a* 10 from t0 A, t0 B;
+insert into t2 select * from seq_0_to_99;
 CREATE TABLE t3 (
 key1 int ,
 key2 int,
@@ -19,11 +17,10 @@ engine
 InnoDB
 insert into t3
 select
-A.a,
-B.a,
+A.seq,
+B.seq,
 'filler-data-filler-data'
-from
-t2 A, t2 B;
+from seq_0_to_99 A, seq_0_to_99 B;
 analyze table t2,t3;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	status	Engine-independent statistics collected
@@ -42,7 +39,6 @@ select * from t2, t3
 where 
 t3.key1=t2.a and t3.key2 in (2,3);
 connect  con1, localhost, root,,;
-connection con1;
 set debug_sync='now WAIT_FOR at_rowid_filter_check';
 kill query $target_id;
 set debug_sync='now SIGNAL go';
@@ -50,7 +46,7 @@ connection default;
 disconnect con1;
 ERROR 70100: Query execution was interrupted
 set debug_sync='RESET';
-drop table t0,t2,t3;
+drop table t2,t3;
 set default_storage_engine=default;
 set @save_optimizer_switch= @@optimizer_switch;
 set @save_use_stat_tables= @@use_stat_tables;
@@ -77,7 +73,6 @@ test.t1	analyze	status	OK
 set debug_sync='handler_rowid_filter_check SIGNAL killme WAIT_FOR go';
 SELECT * FROM t1 WHERE a > 0 AND b=0;
 connect  con1, localhost, root,,;
-connection con1;
 set debug_sync='now WAIT_FOR killme';
 kill query @id;
 set debug_sync='now SIGNAL go';
diff --git a/mysql-test/main/rowid_filter_innodb_debug.test b/mysql-test/main/rowid_filter_innodb_debug.test
index 74deaa8ccc9..6353ffa335e 100644
--- a/mysql-test/main/rowid_filter_innodb_debug.test
+++ b/mysql-test/main/rowid_filter_innodb_debug.test
@@ -39,7 +39,6 @@ set debug_sync='handler_rowid_filter_check SIGNAL killme WAIT_FOR go';
 send SELECT * FROM t1 WHERE a > 0 AND b=0;
 
 connect (con1, localhost, root,,);
-connection con1;
 let $ignore= `SELECT @id := $ID`;
 set debug_sync='now WAIT_FOR killme';
 kill query @id;
diff --git a/mysql-test/main/rowid_filter_myisam_debug.result b/mysql-test/main/rowid_filter_myisam_debug.result
index 32a989f50da..75a8fad6947 100644
--- a/mysql-test/main/rowid_filter_myisam_debug.result
+++ b/mysql-test/main/rowid_filter_myisam_debug.result
@@ -1,10 +1,8 @@
 #
 # MDEV-22761 KILL QUERY during rowid_filter, crashes
 #
-create table t0(a int);
-insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2(a int);
-insert into t2 select A.a + B.a* 10 from t0 A, t0 B;
+insert into t2 select * from seq_0_to_99;
 CREATE TABLE t3 (
 key1 int ,
 key2 int,
@@ -18,11 +16,10 @@ engine
 MyISAM
 insert into t3
 select
-A.a,
-B.a,
+A.seq,
+B.seq,
 'filler-data-filler-data'
-from
-t2 A, t2 B;
+from seq_0_to_99 A, seq_0_to_99 B;
 analyze table t2,t3;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	status	Engine-independent statistics collected
@@ -41,7 +38,6 @@ select * from t2, t3
 where 
 t3.key1=t2.a and t3.key2 in (2,3);
 connect  con1, localhost, root,,;
-connection con1;
 set debug_sync='now WAIT_FOR at_rowid_filter_check';
 kill query $target_id;
 set debug_sync='now SIGNAL go';
@@ -49,4 +45,4 @@ connection default;
 disconnect con1;
 ERROR 70100: Query execution was interrupted
 set debug_sync='RESET';
-drop table t0,t2,t3;
+drop table t2,t3;