2 files changed, 8 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 25d17fc2af4..3ed077a6808 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * automated/decoder-tests.el (ert-test-decoder-prefer-utf-8):
+        Force Unix EOLs by using 'utf-8-unix', since the default of
+        'utf-8' is system-dependent, while the test expects to see Unix
+        EOLs.
+
 2013-11-28  Glenn Morris  <rgm@gnu.org>
 
         * automated/Makefile.in (SEPCHAR): Use in place of PATH_SEP.
diff --git a/test/automated/decoder-tests.el b/test/automated/decoder-tests.el
index 2e99fd7f115..1326e95e3d6 100644
--- a/test/automated/decoder-tests.el
+++ b/test/automated/decoder-tests.el
@@ -247,7 +247,7 @@
                                            'unix))
             (latin (decoder-tests-gen-file "utf-8.el"
                                            (decoder-tests-file-contents 'latin)
-                                           'utf-8)))
+                                           'utf-8-unix)))
         (should-not (decoder-tests-prefer-utf-8-read
                      ascii 'prefer-utf-8-unix nil))
         (should-not (decoder-tests-prefer-utf-8-read