diff --git a/test/jdk/java/util/logging/DrainFindDeadlockTest.java b/test/jdk/java/util/logging/DrainFindDeadlockTest.java
index 7bd7b81bd90..9dc7325cecf 100644
--- a/test/jdk/java/util/logging/DrainFindDeadlockTest.java
+++ b/test/jdk/java/util/logging/DrainFindDeadlockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,11 @@
 import java.lang.Thread.State;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
+import java.util.Random;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import java.util.Map;
+import jdk.test.lib.RandomFactory;
 
 /**
  * @test
@@ -36,6 +38,7 @@
  * @author jim.gish@oracle.com
  * @modules java.logging
  *          java.management
+ * @library /test/lib
  * @build DrainFindDeadlockTest
  * @run main/othervm DrainFindDeadlockTest
  * @key randomness
@@ -50,6 +53,8 @@
 public class DrainFindDeadlockTest {
     private LogManager mgr = LogManager.getLogManager();
     private static final int MAX_ITERATIONS = 100;
+    private static final Random random = RandomFactory.getRandom();
+    private static int preventLoopElision;
 
     // Get a ThreadMXBean so we can check for deadlock.  N.B. this may
     // not be supported on all platforms, which means we will have to
@@ -66,12 +71,13 @@ public static void main(String... args) throws IOException, Exception {
     }
 
     public static void randomDelay() {
-        int runs = (int) Math.random() * 1000000;
+        int runs = random.nextInt(1000000);
         int c = 0;
 
         for (int i=0; i<runs; ++i) {
             c=c+i;
         }
+        preventLoopElision = c;
     }
 
     public void testForDeadlock() throws IOException, Exception {
diff --git a/test/jdk/java/util/logging/LoggingDeadlock.java b/test/jdk/java/util/logging/LoggingDeadlock.java
index 131c92942f7..249c2b75e05 100644
--- a/test/jdk/java/util/logging/LoggingDeadlock.java
+++ b/test/jdk/java/util/logging/LoggingDeadlock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @summary deadlock in LogManager
  * @author  Serguei Spitsyn / SAP
  *
+ * @library  /test/lib
  * @build    LoggingDeadlock
  * @run  main/timeout=15 LoggingDeadlock
  * @key randomness
@@ -53,18 +54,24 @@
  */
 
 
+import java.util.Random;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
+import jdk.test.lib.RandomFactory;
 
 public class LoggingDeadlock {
 
+    private static int preventLoopElision;
+    private static final Random random = RandomFactory.getRandom();
+
     public static void randomDelay() {
-        int runs = (int) Math.random() * 1000000;
+        int runs = random.nextInt(1000000);
         int c = 0;
 
         for (int i = 0; i < runs; ++i) {
             c = c + i;
         }
+        preventLoopElision = c;
     }
 
     public static void main(String[] args) throws InterruptedException{