diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
index 7a65d0e6ea2..8bd2ffcb873 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
@@ -139,7 +139,7 @@ public class StoreFileInfo implements Configurable {
 
     this.fs = fs;
     this.conf = conf;
-    this.initialPath = fs.makeQualified(initialPath);
+    this.initialPath = initialPath;
     this.primaryReplica = primaryReplica;
     this.noReadahead =
       this.conf.getBoolean(STORE_FILE_READER_NO_READAHEAD, DEFAULT_STORE_FILE_READER_NO_READAHEAD);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index 5f817bdb414..e9f87353bc7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -941,16 +941,13 @@ public class TestHStore {
   private void closeCompactedFile(int index) throws IOException {
     Collection<HStoreFile> files =
       this.store.getStoreEngine().getStoreFileManager().getCompactedfiles();
-    if (files.size() > 0) {
-      HStoreFile sf = null;
-      Iterator<HStoreFile> it = files.iterator();
-      for (int i = 0; i <= index; i++) {
-        sf = it.next();
-      }
-      sf.closeStoreFile(true);
-      store.getStoreEngine().getStoreFileManager().
-        removeCompactedFiles(Collections.singletonList(sf));
+    HStoreFile sf = null;
+    Iterator<HStoreFile> it = files.iterator();
+    for (int i = 0; i <= index; i++) {
+      sf = it.next();
     }
+    sf.closeStoreFile(true);
+    store.getStoreEngine().getStoreFileManager().removeCompactedFiles(Lists.newArrayList(sf));
   }
 
   @Test