diff --git a/mysql-test/main/join_cache_debug.result b/mysql-test/main/join_cache_debug.result
index f6c450ed3a5..c0769d5117d 100644
--- a/mysql-test/main/join_cache_debug.result
+++ b/mysql-test/main/join_cache_debug.result
@@ -24,8 +24,7 @@ select
 t1.b as t1_b, t2.b as t2_b, t2.d as t2_d
 FROM t1
 LEFT JOIN t2 ON t1.b = t2.b;
-SET @old_debug=@@debug_dbug;
-SET debug_dbug='+d,analyze_print_r_unpack_ops';
+SET statement debug_dbug='+d,analyze_print_r_unpack_ops' for
 analyze
 format=json
 SELECT COUNT(*)
diff --git a/mysql-test/main/join_cache_debug.test b/mysql-test/main/join_cache_debug.test
index 6179daaf947..aba36b14f29 100644
--- a/mysql-test/main/join_cache_debug.test
+++ b/mysql-test/main/join_cache_debug.test
@@ -20,10 +20,9 @@ select
 FROM t1
      LEFT JOIN t2 ON t1.b = t2.b;
 
-SET @old_debug=@@debug_dbug;
-SET debug_dbug='+d,analyze_print_r_unpack_ops';
-
-let $q= analyze
+let $q=
+SET statement debug_dbug='+d,analyze_print_r_unpack_ops' for
+analyze
 format=json
 SELECT COUNT(*)
 FROM t1_t2