diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java
index 595eb852ee87d..e71029b5a1b04 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java
@@ -1584,12 +1584,16 @@ public void testGetRunningContainersToKill() {
         node.getContainersToKill());
   }
 
+  private static long LAST_TIMESTAMP = 0L;
   private static RMContainer newMockRMContainer(boolean isAMContainer,
       ExecutionType executionType, String name) {
+    long now = Time.now();
+    while (now <= LAST_TIMESTAMP) { now = Time.now(); }
+    LAST_TIMESTAMP = now;
     RMContainer container = mock(RMContainer.class);
     when(container.isAMContainer()).thenReturn(isAMContainer);
     when(container.getExecutionType()).thenReturn(executionType);
-    when(container.getCreationTime()).thenReturn(Time.now());
+    when(container.getCreationTime()).thenReturn(now);
     when(container.toString()).thenReturn(name);
     return container;
   }
@@ -1597,7 +1601,7 @@ private static RMContainer newMockRMContainer(boolean isAMContainer,
   /**
    * SchedulerNode mock to test launching containers.
    */
-  class MockSchedulerNode extends SchedulerNode {
+  static class MockSchedulerNode extends SchedulerNode {
     private final List<RMContainer> containers = new ArrayList<>();
 
     MockSchedulerNode() {