diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java
deleted file mode 100644
index 523911b6384..00000000000
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.regionserver;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.apache.hadoop.hbase.testclassification.RegionServerTests;
-import org.apache.hadoop.hbase.zookeeper.ZKUtil;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-/**
- * Tests for the hostname specification by region server
- */
-@Category({RegionServerTests.class, MediumTests.class})
-public class TestRegionServerHostname {
-  private static final Log LOG = LogFactory.getLog(TestRegionServerHostname.class);
-  private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
-
-  @Test (timeout=30000)
-  public void testInvalidRegionServerHostname() throws Exception {
-    final int NUM_MASTERS = 1;
-    final int NUM_RS = 1;
-    String invalidHostname = "hostAddr";
-    TEST_UTIL.getConfiguration().set(HRegionServer.HOSTNAME_KEY, invalidHostname);
-    try {
-      TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);
-    } catch (IOException ioe) {
-      Throwable t1 = ioe.getCause();
-      Throwable t2 = t1.getCause();
-      assertTrue(t2.getMessage().contains("Failed resolve of " + invalidHostname));
-      return;
-    } finally {
-      TEST_UTIL.shutdownMiniCluster();
-    }
-    assertTrue("Failed to validate against invalid hostname", false);
-  }
-
-  @Test(timeout=120000)
-  public void testRegionServerHostname() throws Exception {
-    final int NUM_MASTERS = 1;
-    final int NUM_RS = 1;
-    Enumeration<NetworkInterface> netInterfaceList = NetworkInterface.getNetworkInterfaces();
-
-    while (netInterfaceList.hasMoreElements()) {
-      NetworkInterface ni = netInterfaceList.nextElement();
-      Enumeration<InetAddress> addrList = ni.getInetAddresses();
-      // iterate through host addresses and use each as hostname
-      while (addrList.hasMoreElements()) {
-        InetAddress addr = addrList.nextElement();
-        if (addr.isLoopbackAddress() || addr.isLinkLocalAddress()) continue;
-        if (addr.isMulticastAddress()) continue;
-        String hostAddr = addr.getHostAddress();
-        LOG.info("Found " + hostAddr + " on " + ni);
-        
-        TEST_UTIL.getConfiguration().set(HRegionServer.HOSTNAME_KEY, hostAddr);
-        TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);
-        try {
-          ZooKeeperWatcher zkw = TEST_UTIL.getZooKeeperWatcher();
-          List<String> servers = ZKUtil.listChildrenNoWatch(zkw, zkw.rsZNode);
-          assertTrue(servers.size() > 0);
-          for (String server : servers) {
-            assertTrue(server.startsWith(hostAddr+","));
-          }
-          zkw.close();
-        } finally {
-          TEST_UTIL.shutdownMiniCluster();
-        }
-      }
-    }
-  }
-}