diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
index d0ad092cf5d..4994d0415b0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
@@ -760,7 +760,7 @@ public class TestDFSShell {
           .format(true)
           .numDataNodes(2)
           .nameNodePort(ServerSocketUtil.waitForPort(
-              HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT, 10))
+              HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT, 60))
           .waitSafeMode(true)
           .build();
       FileSystem srcFs = cluster.getFileSystem();