Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java (revision 1582862) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java (working copy) @@ -300,6 +300,9 @@ do { // kill a random non-meta server carrying at least one region killIndex = random.nextInt(servers.length); + if (killIndex == SLAVES) { + killIndex = SLAVES-1; + } serverToKill = TEST_UTIL.getHBaseCluster().getRegionServer(killIndex).getServerName(); Collection regs = TEST_UTIL.getHBaseCluster().getRegionServer(killIndex).getOnlineRegionsLocalContext();