diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index e8af34272d5..00ec7c2a95b 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -66,6 +66,9 @@ Release 2.4.0 - UNRELEASED
     MAPREDUCE-5768. TestMRJobs.testContainerRollingLog fails on trunk (Gera
     Shegalov via jlowe)
 
+    MAPREDUCE-5780. SliveTest should use the specified path to get the
+    particular FileSystem instead of using the default FileSystem.  (szetszwo)
+
 Release 2.3.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java
index 47e105c2e50..ce1837f3afe 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java
@@ -58,7 +58,6 @@ import org.apache.hadoop.util.ToolRunner;
  * The number of maps is specified by "slive.maps".
  * The number of reduces is specified by "slive.reduces".
  */
-@SuppressWarnings("deprecation")
 public class SliveTest implements Tool {
 
   private static final Log LOG = LogFactory.getLog(SliveTest.class);
@@ -221,7 +220,7 @@ public class SliveTest implements Tool {
   private void writeReport(ConfigExtractor cfg) throws Exception {
     Path dn = cfg.getOutputPath();
     LOG.info("Writing report using contents of " + dn);
-    FileSystem fs = FileSystem.get(cfg.getConfig());
+    FileSystem fs = dn.getFileSystem(cfg.getConfig());
     FileStatus[] reduceFiles = fs.listStatus(dn);
     BufferedReader fileReader = null;
     PrintWriter reportWriter = null;
@@ -292,10 +291,10 @@ public class SliveTest implements Tool {
    * @throws IOException
    */
   private void cleanup(ConfigExtractor cfg) throws IOException {
-    FileSystem fs = FileSystem.get(cfg.getConfig());
     Path base = cfg.getBaseDirectory();
     if (base != null) {
       LOG.info("Attempting to recursively delete " + base);
+      FileSystem fs = base.getFileSystem(cfg.getConfig());
       fs.delete(base, true);
     }
   }