Index: core/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- core/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 945822) +++ core/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -151,13 +151,14 @@ * @see #shutdownMiniZKCluster() */ public void startMiniZKCluster() throws Exception { - isRunningCluster(); - this.clusterTestBuildDir = setupClusterTestBuildDir(); - startMiniZKCluster(this.clusterTestBuildDir); + startMiniZKCluster(setupClusterTestBuildDir()); } private void startMiniZKCluster(final File dir) throws Exception { + if (this.zkCluster != null) { + throw new IOException("Cluster already running at " + dir); + } this.zkCluster = new MiniZooKeeperCluster(); int clientPort = this.zkCluster.startup(dir); this.conf.set("hbase.zookeeper.property.clientPort", Index: core/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java =================================================================== --- core/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (revision 945822) +++ core/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (working copy) @@ -45,6 +45,8 @@ */ @BeforeClass public static void setUpBeforeClass() throws Exception { + // Test we can first start the ZK cluster by itself + TEST_UTIL.startMiniZKCluster(); TEST_UTIL.getConfiguration().setBoolean("dfs.support.append", true); TEST_UTIL.startMiniCluster(1); }