diff --git a/mysql-test/r/truncate_coverage.result b/mysql-test/r/truncate_coverage.result
index 7a5021f55e2..a7a4b9c70f4 100644
--- a/mysql-test/r/truncate_coverage.result
+++ b/mysql-test/r/truncate_coverage.result
@@ -18,13 +18,15 @@ TRUNCATE TABLE t1;
 SET DEBUG_SYNC='now WAIT_FOR waiting';
 KILL QUERY @id;
 #
+# connection default
+ERROR 70100: Query execution was interrupted
+UNLOCK TABLES;
+#
 # connection con1
 # Release shared metadata lock by closing HANDLER.
 HANDLER t1 CLOSE;
 #
 # connection default
-ERROR 70100: Query execution was interrupted
-UNLOCK TABLES;
 DROP TABLE t1;
 SET DEBUG_SYNC='RESET';
 CREATE TABLE t1 (c1 INT);
@@ -64,10 +66,15 @@ TRUNCATE TABLE t1;
 # connection con1
 SET DEBUG_SYNC='now WAIT_FOR waiting';
 KILL QUERY @id;
-COMMIT;
 #
 # connection default
 ERROR 70100: Query execution was interrupted
+#
+# connection con1
+# Release SW lock by committing transaction.
+COMMIT;
+#
+# connection default
 UNLOCK TABLES;
 DROP TABLE t1;
 SET DEBUG_SYNC='RESET';
diff --git a/mysql-test/t/truncate_coverage.test b/mysql-test/t/truncate_coverage.test
index b7c08b03c8b..c9c4bd90ca4 100644
--- a/mysql-test/t/truncate_coverage.test
+++ b/mysql-test/t/truncate_coverage.test
@@ -55,6 +55,12 @@ let $invisible_assignment_in_select = `SELECT @id := $ID`;
 KILL QUERY @id;
 --disconnect con2
 --echo #
+--echo # connection default
+--connection default
+--error ER_QUERY_INTERRUPTED
+reap;
+UNLOCK TABLES;
+--echo #
 --echo # connection con1
 --connection con1
 --echo # Release shared metadata lock by closing HANDLER.
@@ -63,9 +69,6 @@ HANDLER t1 CLOSE;
 --echo #
 --echo # connection default
 --connection default
---error ER_QUERY_INTERRUPTED
-reap;
-UNLOCK TABLES;
 DROP TABLE t1;
 SET DEBUG_SYNC='RESET';
 ########
@@ -151,13 +154,20 @@ send TRUNCATE TABLE t1;
 SET DEBUG_SYNC='now WAIT_FOR waiting';
 let $invisible_assignment_in_select = `SELECT @id := $ID`;
 KILL QUERY @id;
-COMMIT;
---disconnect con1
 --echo #
 --echo # connection default
 --connection default
 --error ER_QUERY_INTERRUPTED
 reap;
+--echo #
+--echo # connection con1
+--connection con1
+--echo # Release SW lock by committing transaction.
+COMMIT;
+--disconnect con1
+--echo #
+--echo # connection default
+--connection default
 UNLOCK TABLES;
 DROP TABLE t1;
 SET DEBUG_SYNC='RESET';