diff --git a/src/etc/testcases/filters/concat.xml b/src/etc/testcases/filters/concat.xml
index 2c611828d..48618247f 100644
--- a/src/etc/testcases/filters/concat.xml
+++ b/src/etc/testcases/filters/concat.xml
@@ -7,6 +7,8 @@
     <echo file="result/append.txt" message="this-should-be-the-last-line${line.separator}"/>
     <copy file="input/head-tail.test" tofile="input/concatfilter.test"/>
     <fixcrlf srcDir="input" includes="concatfilter.test"/>
+    <!-- to be consistent on MacOS X.  fixcrlf uses CR while line.sep is LF -->
+    <fixcrlf srcDir="result" includes="append.txt,prepend.txt"/>
   </target>
 
   <target name="cleanup">
diff --git a/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java b/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
index 28cb4408c..db6f67b9c 100644
--- a/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.util.FileUtils;
 
 /**
@@ -29,7 +30,8 @@ import org.apache.tools.ant.util.FileUtils;
 public class ConcatFilterTest extends BuildFileTest {
 
     private static FileUtils fu = FileUtils.newFileUtils();
-    private static final String lSep = System.getProperty("line.separator");
+    private static final String lSep = 
+        Os.isFamily("mac") ? "\r" : System.getProperty("line.separator");
 
     private static final String FILE_PREPEND_WITH =
           "this-should-be-the-first-line" + lSep