diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ef98e212f2b..69776c33486 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -289,6 +289,9 @@ Release 2.4.0 - UNRELEASED
     YARN-1559. Race between ServerRMProxy and ClientRMProxy setting 
     RMProxy#INSTANCE. (kasha and vinodkv via kasha)
 
+    YARN-1560. Fixed TestYarnClient#testAMMRTokens failure with null AMRM token.
+    (Ted Yu via jianhe)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
index 966995c99ce..00ab7895d67 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
@@ -378,6 +378,13 @@ public class TestYarnClient {
 
       appId = createApp(rmClient, true);
       waitTillAccepted(rmClient, appId);
+      long start = System.currentTimeMillis();
+      while (rmClient.getAMRMToken(appId) == null) {
+        if (System.currentTimeMillis() - start > 20 * 1000) {
+          Assert.fail("AMRM token is null");
+        }
+        Thread.sleep(100);
+      }
       //unmanaged AMs do return AMRM token
       Assert.assertNotNull(rmClient.getAMRMToken(appId));
       
@@ -392,6 +399,13 @@ public class TestYarnClient {
             rmClient.start();
             ApplicationId appId = createApp(rmClient, true);
             waitTillAccepted(rmClient, appId);
+            long start = System.currentTimeMillis();
+            while (rmClient.getAMRMToken(appId) == null) {
+              if (System.currentTimeMillis() - start > 20 * 1000) {
+                Assert.fail("AMRM token is null");
+              }
+              Thread.sleep(100);
+            }
             //unmanaged AMs do return AMRM token
             Assert.assertNotNull(rmClient.getAMRMToken(appId));
             return appId;