diff --git a/CHANGES.txt b/CHANGES.txt
index abac52e6ebc..8bea2e04b7a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -553,6 +553,7 @@ Release 0.21.0 - Unreleased
    HBASE-3038  WALReaderFSDataInputStream.getPos() fails if Filesize > MAX_INT
                (Nicolas Spiegelberg via Stack)
    HBASE-3047  If new master crashes, restart is messy
+   HBASE-3054  Remore TestEmptyMetaInfo; it doesn't make sense any more.
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/src/test/java/org/apache/hadoop/hbase/TestEmptyMetaInfo.java b/src/test/java/org/apache/hadoop/hbase/TestEmptyMetaInfo.java
deleted file mode 100644
index 441c156bbd9..00000000000
--- a/src/test/java/org/apache/hadoop/hbase/TestEmptyMetaInfo.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright 2008 The Apache Software Foundation
- *
- * 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;
-
-import java.io.IOException;
-
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.util.Bytes;
-
-/**
- * Tests master cleanup of rows in meta table where there is no HRegionInfo
- * TODO: Does this test make sense any more?
- */
-public class TestEmptyMetaInfo extends HBaseClusterTestCase {
-  /**
-   * Insert some bogus rows in meta. Master should clean them up.
-   * @throws IOException
-   */
-  public void testEmptyMetaInfo() throws IOException {
-    HTable t = new HTable(conf, HConstants.META_TABLE_NAME);
-    final int COUNT = 5;
-    final byte [] tableName = Bytes.toBytes(getName());
-    for (int i = 0; i < COUNT; i++) {
-      byte [] regionName = HRegionInfo.createRegionName(tableName,
-        Bytes.toBytes(i == 0? "": Integer.toString(i)),
-        Long.toString(System.currentTimeMillis()), true);
-      Put put = new Put(regionName);
-      put.add(HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER,
-          Bytes.toBytes("localhost:1234"));
-      t.put(put);
-    }
-    long sleepTime = conf.getLong("hbase.master.monitor.interval", 1000);
-    int tries = conf.getInt("hbase.client.retries.number", 5);
-    int count = 0;
-    do {
-      tries -= 1;
-      try {
-        Thread.sleep(sleepTime);
-      } catch (InterruptedException e) {
-        // ignore
-      }
-      Scan scan = new Scan();
-      scan.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);
-      scan.addColumn(HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER);
-      scan.addColumn(HConstants.CATALOG_FAMILY, HConstants.STARTCODE_QUALIFIER);
-      scan.addColumn(HConstants.CATALOG_FAMILY, HConstants.SPLITA_QUALIFIER);
-      scan.addColumn(HConstants.CATALOG_FAMILY, HConstants.SPLITB_QUALIFIER);
-      ResultScanner scanner = t.getScanner(scan);
-      try {
-        count = 0;
-        Result r;
-        while((r = scanner.next()) != null) {
-          if (!r.isEmpty()) {
-            count += 1;
-          }
-        }
-      } finally {
-        scanner.close();
-      }
-    } while (count != 0 && tries >= 0);
-    assertTrue(tries >= 0);
-    assertEquals(0, count);
-  }
-}