Index: core/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- core/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 943701) +++ core/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -186,12 +186,13 @@ public void startMiniCluster(final int servers) throws Exception { LOG.info("Starting up minicluster"); - // If we already put up a cluster, fail. - isRunningCluster(); + // If we already put up a cluster, fail. Unless only zk was started + if (this.zkCluster == null && this.dfsCluster == null) { + isRunningCluster(); + this.clusterTestBuildDir = setupClusterTestBuildDir(); + } String oldBuildTestDir = - System.getProperty(TEST_DIRECTORY_KEY, "build/test/data"); - this.clusterTestBuildDir = setupClusterTestBuildDir(); - + System.getProperty(TEST_DIRECTORY_KEY, "build/test/data"); // Set our random dir while minidfscluster is being constructed. System.setProperty(TEST_DIRECTORY_KEY, this.clusterTestBuildDir.getPath()); // Bring up mini dfs cluster. This spews a bunch of warnings about missing Index: core/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java =================================================================== --- core/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (revision 943701) +++ core/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (working copy) @@ -43,6 +43,8 @@ */ @BeforeClass public static void setUpBeforeClass() throws Exception { + // Test we can first start the ZK cluster by itself + TEST_UTIL.startMiniZKCluster(); TEST_UTIL.startMiniCluster(1); }