diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
index 49058a6c6db..328e5e9e9b8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
@@ -627,7 +627,7 @@ public class TestAdmin {
     HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(tableName));
     desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
     admin.createTable(desc, splitKeys);
-    
+
     boolean tableAvailable = admin.isTableAvailable(Bytes.toString(tableName), splitKeys);
     assertTrue("Table should be created with splitKyes + 1 rows in META", tableAvailable);
 
@@ -826,7 +826,7 @@ public class TestAdmin {
     }
   }
 
-  @Test (timeout=300000)
+  @Test (timeout=120000)
   public void testTableExist() throws IOException {
     final byte [] table = Bytes.toBytes("testTableExist");
     boolean exist;
@@ -1729,4 +1729,4 @@ public class TestAdmin {
       ct.stop();
     }
   }
-}
\ No newline at end of file
+}