diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
index 82b6d6ffd9e..ea05b76ce44 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
@@ -129,8 +129,7 @@ public class TestThriftServerCmdLine {
   }
 
   private void startCmdLineThread(final String[] args) {
-    LOG.info("Starting HBase Thrift server with command line: " +
-        Joiner.on(" ").join(args));
+    LOG.info("Starting HBase Thrift server with command line: " + Joiner.on(" ").join(args));
 
     cmdLineException = null;
     cmdLineThread = new Thread(new Runnable() {
@@ -148,7 +147,7 @@ public class TestThriftServerCmdLine {
     cmdLineThread.start();
   }
 
-  @Test(timeout=300 * 1000)
+  @Test(timeout=600000)
   public void testRunThriftServer() throws Exception {
     List<String> args = new ArrayList<String>();
     if (implType != null) {