diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java
index 391e482c19..b835a3b3d2 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java
@@ -43,14 +43,14 @@ public TestTeraSort()
 
   @After
   public void tearDown() throws Exception {
-    getFileSystem().delete(new Path(TEST_DIR), true);
+    getFileSystem().delete(TEST_DIR, true);
     super.tearDown();
   }
   
   // Input/Output paths for sort
-  private static final String TEST_DIR = 
-    new File(System.getProperty("test.build.data", "/tmp"), "terasort")
-    .getAbsolutePath();
+  private static final Path TEST_DIR = new Path(new File(
+    System.getProperty("test.build.data", "/tmp"), "terasort")
+    .getAbsoluteFile().toURI().toString());
   private static final Path SORT_INPUT_PATH = new Path(TEST_DIR, "sortin");
   private static final Path SORT_OUTPUT_PATH = new Path(TEST_DIR, "sortout");
   private static final Path TERA_OUTPUT_PATH = new Path(TEST_DIR, "validate");