diff --git a/mysql-test/suite/plugins/t/unix_socket.test b/mysql-test/suite/plugins/t/unix_socket.test
index 892b6f7516197..fdedb4fbc2b91 100644
--- a/mysql-test/suite/plugins/t/unix_socket.test
+++ b/mysql-test/suite/plugins/t/unix_socket.test
@@ -16,6 +16,9 @@ eval grant select on test.* to '$USER';
 --let $replace2=$USER@%
 --replace_result $replace1 "USER@localhost" $replace2 "USER@%"
 select user(), current_user(), database();
+# Enforce the cleanup so the next execution of in DROP USER
+# doesn't see this connection active.
+--ping
 EOF
 
 --echo #