diff --git a/mysql-test/main/log_slow_debug.result b/mysql-test/main/log_slow_debug.result
index f06e47604ac..88019d87322 100644
--- a/mysql-test/main/log_slow_debug.result
+++ b/mysql-test/main/log_slow_debug.result
@@ -216,15 +216,6 @@ sql_text
 [slow] DEALLOCATE PREPARE stmt
 [slow] DROP SEQUENCE s4
 #
-# Clean up
-#
-SET SESSION debug_dbug=@saved_dbug;
-TRUNCATE mysql.slow_log;
-SET @@global.slow_query_log= @org_slow_query_log;
-SET @@global.log_output= @org_log_output;
-SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
-DROP PROCEDURE show_slow_log;
-#
 # MDEV-30820: slow log Rows_examined out of range
 #
 CREATE TABLE `tab_MDEV_30820` (
@@ -253,3 +244,12 @@ drop table tab_MDEV_30820;
 #
 # End of 10.4 test
 #
+#
+# Clean up
+#
+SET SESSION debug_dbug=@saved_dbug;
+TRUNCATE mysql.slow_log;
+SET @@global.slow_query_log= @org_slow_query_log;
+SET @@global.log_output= @org_log_output;
+SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
+DROP PROCEDURE show_slow_log;
diff --git a/mysql-test/main/log_slow_debug.test b/mysql-test/main/log_slow_debug.test
index 17ca9039850..5c8385f2fc9 100644
--- a/mysql-test/main/log_slow_debug.test
+++ b/mysql-test/main/log_slow_debug.test
@@ -83,18 +83,6 @@ TRUNCATE TABLE mysql.slow_log;
 CALL show_slow_log();
 
 
---echo #
---echo # Clean up
---echo #
-
-SET SESSION debug_dbug=@saved_dbug;
-TRUNCATE mysql.slow_log;
-SET @@global.slow_query_log= @org_slow_query_log;
-SET @@global.log_output= @org_log_output;
-SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
-DROP PROCEDURE show_slow_log;
-
-
 --echo #
 --echo # MDEV-30820: slow log Rows_examined out of range
 --echo #
@@ -131,3 +119,14 @@ drop table tab_MDEV_30820;
 --echo #
 --echo # End of 10.4 test
 --echo #
+
+--echo #
+--echo # Clean up
+--echo #
+
+SET SESSION debug_dbug=@saved_dbug;
+TRUNCATE mysql.slow_log;
+SET @@global.slow_query_log= @org_slow_query_log;
+SET @@global.log_output= @org_log_output;
+SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
+DROP PROCEDURE show_slow_log;