diff --git a/jdk/test/java/lang/management/ThreadMXBean/LockingThread.java b/jdk/test/java/lang/management/ThreadMXBean/LockingThread.java
index 11fa9d9023a..801d35704c5 100644
--- a/jdk/test/java/lang/management/ThreadMXBean/LockingThread.java
+++ b/jdk/test/java/lang/management/ThreadMXBean/LockingThread.java
@@ -66,6 +66,8 @@ public class LockingThread extends Thread {
                throw new RuntimeException(e);
            }
         }
+        Utils.waitForBlockWaitingState(t1);
+        Utils.waitForBlockWaitingState(t2);
     }
     static long[] getThreadIds() {
         return new long[] {t1.getId(), t2.getId()};
diff --git a/jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java b/jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java
index ad5b822b52d..da3b11902e6 100644
--- a/jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java
+++ b/jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java
@@ -83,11 +83,24 @@ public class MonitorDeadlock {
 
     void waitUntilDeadlock() {
         barr.await();
-        // sleep a little while to wait until threads are blocked.
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException e) {
-            // ignore
+
+        for (int i=0; i < 100; i++) {
+            // sleep a little while to wait until threads are blocked.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                // ignore
+            }
+            boolean retry = false;
+            for (Thread t: dThreads) {
+                if (t.getState() == Thread.State.RUNNABLE) {
+                    retry = true;
+                    break;
+                }
+            }
+            if (!retry) {
+                break;
+            }
         }
     }