diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java
index 351f068c2bb..2a4e49d910e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java
@@ -123,8 +123,9 @@ public Void run() throws Exception {
             return null;
           } catch (YarnException ex) {
             Assert.assertTrue(ex.getMessage().contains(
-                owner.getUserName() + " tries to renew a token with renewer "
-                    + other.getUserName()));
+                owner.getUserName() + " tries to renew a token"));
+            Assert.assertTrue(ex.getMessage().contains(
+                "with non-matching renewer " + other.getUserName()));
             throw ex;
           }
         }