diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/HddsUpgradeTestUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/HddsUpgradeTestUtils.java
index 3f735828b4c5..a63fbf1d1043 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/HddsUpgradeTestUtils.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/HddsUpgradeTestUtils.java
@@ -143,6 +143,7 @@ private static boolean isScmFinalized(StorageContainerManager scm, boolean waitF
             "Requiring DB key to flush? {}",
         scm.getSCMNodeId(), scm.checkLeader(), exitedSafemode, isFinalized, dbKeyFlushed, waitForDBKeyFlush);
 
-    return exitedSafemode && isFinalized && (!waitForDBKeyFlush || dbKeyFlushed);
+    // Safemode exit status is included for logging purposes, but SCMs can still finalize while in safemode.
+    return isFinalized && (!waitForDBKeyFlush || dbKeyFlushed);
   }
 }