diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index dfe8f4d30a..be7b9bf653 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1356,6 +1356,8 @@ Release 2.6.0 - UNRELEASED
 
     HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)
 
+    HDFS-7328. TestTraceAdmin assumes Unix line endings. (cnauroth)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java
index 79a1f39633..77860ba1f3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java
@@ -28,6 +28,7 @@
 import java.io.PrintStream;
 
 public class TestTraceAdmin {
+  private static final String NEWLINE = System.getProperty("line.separator");
 
   private String runTraceCommand(TraceAdmin trace, String... cmd)
       throws Exception {
@@ -66,10 +67,10 @@ public void testCreateAndDestroySpanReceiver() throws Exception {
     try {
       TraceAdmin trace = new TraceAdmin();
       trace.setConf(conf);
-      Assert.assertEquals("ret:0, [no span receivers found]\n",
+      Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE,
           runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)));
       Assert.assertEquals("ret:0, Added trace span receiver 1 with " +
-          "configuration local-file-span-receiver.path = " + tracePath + "\n",
+          "configuration local-file-span-receiver.path = " + tracePath + NEWLINE,
           runTraceCommand(trace, "-add", "-host", getHostPortForNN(cluster),
               "-class", "org.htrace.impl.LocalFileSpanReceiver",
               "-Clocal-file-span-receiver.path=" + tracePath));
@@ -77,17 +78,17 @@ public void testCreateAndDestroySpanReceiver() throws Exception {
           runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster));
       Assert.assertTrue(list.startsWith("ret:0"));
       Assert.assertTrue(list.contains("1   org.htrace.impl.LocalFileSpanReceiver"));
-      Assert.assertEquals("ret:0, Removed trace span receiver 1\n",
+      Assert.assertEquals("ret:0, Removed trace span receiver 1" + NEWLINE,
           runTraceCommand(trace, "-remove", "1", "-host",
               getHostPortForNN(cluster)));
-      Assert.assertEquals("ret:0, [no span receivers found]\n",
+      Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE,
           runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)));
       Assert.assertEquals("ret:0, Added trace span receiver 2 with " +
-          "configuration local-file-span-receiver.path = " + tracePath + "\n",
+          "configuration local-file-span-receiver.path = " + tracePath + NEWLINE,
           runTraceCommand(trace, "-add", "-host", getHostPortForNN(cluster),
               "-class", "LocalFileSpanReceiver",
               "-Clocal-file-span-receiver.path=" + tracePath));
-      Assert.assertEquals("ret:0, Removed trace span receiver 2\n",
+      Assert.assertEquals("ret:0, Removed trace span receiver 2" + NEWLINE,
           runTraceCommand(trace, "-remove", "2", "-host",
               getHostPortForNN(cluster)));
     } finally {