diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
index 3cc95e4d77d..c428d20e840 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
@@ -366,7 +366,7 @@ private void waitForNullMxBean() throws TimeoutException, InterruptedException {
         LOG.error("Something went wrong.", t);
         return false;
       }
-    }, 100, 8000);
+    }, 100, 8000, "RollingUpgradeStatus is already set");
   }
 
   private static void startRollingUpgrade(Path foo, Path bar,