diff --git a/mysql-test/include/ddl_high_priority.inc b/mysql-test/include/ddl_high_priority.inc
index 7adca5d7cf25..22ca63b352fd 100644
--- a/mysql-test/include/ddl_high_priority.inc
+++ b/mysql-test/include/ddl_high_priority.inc
@@ -73,6 +73,7 @@ drop table t1_new;
 ## no effect for regular users
 ##
 
+--source include/count_sessions.inc
 connect (con2,localhost,test_user2,,test,,);
 # $con_kill is regular user
 --let $con_kill = con2
@@ -86,6 +87,9 @@ connect (con2,localhost,test_user2,,test,,);
 
 disconnect con2;
 
+# Ensure con2 is closed
+--source include/wait_until_count_sessions.inc
+
 # restore $con_kill
 --let $con_kill = default
 # restore $should_kill