diff --git a/mysql-test/innodb_bug38231.test b/mysql-test/innodb_bug38231.test
index 54f58844c42..1611cb56203 100644
--- a/mysql-test/innodb_bug38231.test
+++ b/mysql-test/innodb_bug38231.test
@@ -27,6 +27,21 @@ SET autocommit=0;
 -- send
 LOCK TABLE bug38231 WRITE;
 
+# When con1 does UNLOCK below this will release either con2 or con3 which are
+# both waiting on LOCK. At the end we must first --reap and UNLOCK the
+# connection that has been released, otherwise it will wait forever. We assume
+# that the released connection will be the first one that has gained the LOCK,
+# thus we force the order here - con2 does LOCK first, then con3. In other
+# words we wait for LOCK from con2 above to be exected before doing LOCK in
+# con3.
+-- connection con1
+let $wait_condition =
+  SELECT COUNT(*) = 1 FROM information_schema.processlist
+  WHERE info = 'LOCK TABLE bug38231 WRITE';
+-- source include/wait_condition.inc
+# the above enables query log, re-disable it
+-- disable_query_log
+
 -- connection con3
 SET autocommit=0;
 -- send