diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index fdb4a6702e..df5c549c59 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -413,6 +413,8 @@ Release 2.4.0 - UNRELEASED
 
     HADOOP-10393. Fix the javac warnings in hadoop-auth.  (szetszwo)
 
+    HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
+
   BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
 
     HADOOP-10185. FileSystem API for ACLs. (cnauroth)
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
index 3e519af8d2..46435f4a67 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
@@ -190,8 +190,6 @@ public void testSwapUnderContention() throws InterruptedException {
 
     Thread.sleep(10);
 
-    assertTrue(manager.size() > 0);
-
     for (int i=0; i < 5; i++) {
       manager.swapQueue(LinkedBlockingQueue.class, 5000, "", null);
     }