diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 6546ade8f1a..c3ebf193380 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -917,10 +917,6 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
     Configuration c = new Configuration(this.conf);
     this.hbaseCluster =
         new MiniHBaseCluster(c, numMasters, numSlaves, masterClass, regionserverClass);
-    // Cluster confguration should set HbaseTestingUtility Conf
-    MiniHBaseCluster miniHBaseCluster = (MiniHBaseCluster) this.hbaseCluster;
-    this.conf = miniHBaseCluster.getMaster().getConfiguration();
-
     // Don't leave here till we've done a successful scan of the hbase:meta
     Table t = new HTable(c, TableName.META_TABLE_NAME);
     ResultScanner s = t.getScanner(new Scan());
@@ -932,7 +928,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
 
     getHBaseAdmin(); // create immediately the hbaseAdmin
     LOG.info("Minicluster is up");
-    return miniHBaseCluster;
+    return (MiniHBaseCluster)this.hbaseCluster;
   }
 
   /**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
index a76d4d7cd3a..62b00d8d24e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
@@ -18,7 +18,6 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedInputStream;
@@ -47,10 +46,11 @@ public class TestInfoServers {
 
   @BeforeClass
   public static void beforeClass() throws Exception {
-    // The info servers do not run in tests by default.   
-    // Set them to ephemeral ports so they will start   
+    // The info servers do not run in tests by default.
+    // Set them to ephemeral ports so they will start
     UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, 0);
-    
+    UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, 0);
+
     //We need to make sure that the server can be started as read only.
     UTIL.getConfiguration().setBoolean("hbase.master.ui.readonly", true);
     UTIL.startMiniCluster();
@@ -61,25 +61,6 @@ public class TestInfoServers {
     UTIL.shutdownMiniCluster();
   }
 
-  /**
-   * Test for checking master info port of cluster whether same with the port of
-   * TestHBaseTestingUtility's getConfiguration .
-   * 
-   * @throws Exception
-   */
-  @Test
-  public void testMasterInfoServerPort() throws Exception {
-    String confPort = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
-    String masterPort =
-        UTIL.getHBaseCluster().getMaster().getConfiguration().get(HConstants.MASTER_INFO_PORT);
-    String regionPort =
-        UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer().getConfiguration()
-            .get(HConstants.MASTER_INFO_PORT);
-
-    assertEquals(confPort, masterPort);
-    assertEquals(confPort, regionPort);
-  }
-  
   /**
    * @throws Exception
    */
@@ -87,11 +68,11 @@ public class TestInfoServers {
   public void testInfoServersRedirect() throws Exception {
     // give the cluster time to start up
     new HTable(UTIL.getConfiguration(), TableName.META_TABLE_NAME).close();
-    String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
+    int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
     assertContainsContent(new URL("http://localhost:" + port +
         "/index.html"), "master-status");
     port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer().
-        getConfiguration().get(HConstants.REGIONSERVER_INFO_PORT);
+      getInfoServer().getPort();
     assertContainsContent(new URL("http://localhost:" + port +
         "/index.html"), "rs-status");
   }
@@ -107,11 +88,11 @@ public class TestInfoServers {
   public void testInfoServersStatusPages() throws Exception {
     // give the cluster time to start up
     new HTable(UTIL.getConfiguration(), TableName.META_TABLE_NAME).close();
-    String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
+    int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
     assertContainsContent(new URL("http://localhost:" + port +
         "/master-status"), "meta");
     port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer().
-        getConfiguration().get(HConstants.REGIONSERVER_INFO_PORT);
+      getInfoServer().getPort();
     assertContainsContent(new URL("http://localhost:" + port +
         "/rs-status"), "meta");
   }
@@ -122,7 +103,7 @@ public class TestInfoServers {
     byte[] cf = Bytes.toBytes("d");
     UTIL.createTable(tableName, cf);
     new HTable(UTIL.getConfiguration(), tableName).close();
-    String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
+    int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
     assertDoesNotContainContent(
       new URL("http://localhost:" + port + "/table.jsp?name=" + tableName + "&action=split&key="),
       "Table action request accepted");