diff --git a/CHANGES.txt b/CHANGES.txt
index 13021466b4e..7f510efb8cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ Hbase Change Log
                havoc of reassignments because open processing is done in series
    HBASE-547   UI shows hadoop version, not hbase version
    HBASE-561   HBase package does not include LICENSE.txt nor build.xml
+   HBASE-563   TestRowFilterAfterWrite erroneously sets master address to
+               0.0.0.0:60100 rather than relying on conf
 
   NEW FEATURES
    HBASE-548   Tool to online single region
diff --git a/src/test/org/apache/hadoop/hbase/filter/TestRowFilterAfterWrite.java b/src/test/org/apache/hadoop/hbase/filter/TestRowFilterAfterWrite.java
index 480dd52c964..2a3d4331752 100644
--- a/src/test/org/apache/hadoop/hbase/filter/TestRowFilterAfterWrite.java
+++ b/src/test/org/apache/hadoop/hbase/filter/TestRowFilterAfterWrite.java
@@ -88,19 +88,6 @@ public class TestRowFilterAfterWrite extends HBaseClusterTestCase {
     conf.setInt("ipc.client.timeout", 20 * 60 * 1000);
   }
 
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void setUp() throws Exception {
-    // this.conf.set(HConstants.HBASE_DIR, "file:///opt/benchmark/hadoop/hbase");
-    this.conf.set(HConstants.MASTER_ADDRESS, "0.0.0.0:60100");
-    // Must call super.setup() after starting mini dfs cluster. Otherwise
-    // we get a local file system instead of hdfs
-
-    super.setUp();
-  }
-
   /**
    * {@inheritDoc}
    */