diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java
index 8c4bdf4d51c6..ebb43723b8f8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java
@@ -72,7 +72,7 @@ class ZKConnectionRegistry implements ConnectionRegistry {
   private final Configuration conf;
   private final int zkRegistryAsyncTimeout;
   public static final String ZK_REGISTRY_ASYNC_GET_TIMEOUT = "zookeeper.registry.async.get.timeout";
-  public static final int DEFAULT_ZK_REGISTRY_ASYNC_GET_TIMEOUT = 60000; // 1 min
+  public static final int DEFAULT_ZK_REGISTRY_ASYNC_GET_TIMEOUT = 10000; // 10 sec
   // User not used, but for rpc based registry we need it
 
   ZKConnectionRegistry(Configuration conf, User ignored) {
diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java
index 23a8c339cd71..f17b29fecec8 100644
--- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java
+++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java
@@ -217,9 +217,9 @@ public void testNotCloseZkWhenPending() throws Exception {
 
   @Test
   public void testReadWithTimeout() throws Exception {
-    assertArrayEquals(DATA, RO_ZK.get(PATH, 60000).get());
-    assertEquals(CHILDREN, RO_ZK.exists(PATH, 60000).get().getNumChildren());
-    List<String> children = RO_ZK.list(PATH, 60000).get();
+    assertArrayEquals(DATA, RO_ZK.get(PATH, 10000).get());
+    assertEquals(CHILDREN, RO_ZK.exists(PATH, 10000).get().getNumChildren());
+    List<String> children = RO_ZK.list(PATH, 10000).get();
     assertEquals(CHILDREN, children.size());
     Collections.sort(children);
     for (int i = 0; i < CHILDREN; i++) {