diff -r b43cb0ec4975 -r 4ed49775c237 jdk/test/java/rmi/testlibrary/RMID.java
--- a/jdk/test/java/rmi/testlibrary/RMID.java	Mon Dec 08 11:54:17 2014 -0800
+++ b/jdk/test/java/rmi/testlibrary/RMID.java	Mon Dec 08 14:32:31 2014 -0800
@@ -257,7 +257,7 @@
         waitTime = waitTime * slopFactor;
 
         long startTime = System.currentTimeMillis();
-        long deadline = startTime + waitTime;
+        long deadline = computeDeadline(startTime, waitTime);
 
         while (true) {
             try {