diff --git a/ChangeLog b/ChangeLog
index 0377cc602..935daff98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* tests/cp/same-file: Execute 'ls' in the C locale, so that it
+	uses POSIX time stamp formats.  Problem reported by John Nixon in
+	<http://lists.gnu.org/archive/html/bug-coreutils/2006-06/msg00062.html>.
+
 2006-06-10  Jim Meyering  <jim@meyering.net>
 
 	* NEWS: Mention the AIX-strndup-bug vs. dircolors workaround.
diff --git a/tests/cp/same-file b/tests/cp/same-file
index 47db0cd15..2cba869b3 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -74,7 +74,7 @@ for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do
 	# and put brackets around the output.
 	test -s _err && echo "[`sed 's/^[^:][^:]*:/cp:/' _err`]"
 	# Strip off all but the file names.
-	ls="`ls -gG --ignore=_err . \
+	ls="`LC_ALL=C ls -gG --ignore=_err . \
 	    | sed \
 	        -e '/^total /d' \
 		-e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`"