Index: src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java (revision 1587710) +++ src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java (working copy) @@ -164,7 +164,10 @@ thriftServer = new ThriftServer(TEST_UTIL.getConfiguration()); startCmdLineThread(args.toArray(new String[0])); - Threads.sleepWithoutInterrupt(2000); + // wait up to 10s for the server to start + for (int i=0; i<100 && (thriftServer.serverRunner == null || thriftServer.serverRunner.tserver == null); i++) { + Thread.sleep(100); + } Class expectedClass = implType != null ? implType.serverClass : TBoundedThreadPoolServer.class;