diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java
index 597f9d5988d..c9e3a64f927 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java
@@ -46,6 +46,7 @@ import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.wal.HLog.Entry;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.hadoop.hbase.HConstants;
@@ -174,10 +175,8 @@ public final class HLogPerformanceEvaluation extends Configured implements Tool
     }
 
     // Run HLog Performance Evaluation
-    // First set the fs from configs.  Do it for both configs in case we
-    // are on hadoop1
-    getConf().set("fs.default.name", getConf().get(HConstants.HBASE_DIR));
-    getConf().set("fs.defaultFS", getConf().get(HConstants.HBASE_DIR));
+    // First set the fs from configs.  In case we are on hadoop1
+    FSUtils.setFsDefault(getConf(), FSUtils.getRootDir(getConf()));
     FileSystem fs = FileSystem.get(getConf());
     LOG.info("FileSystem: " + fs);
     try {