diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -670,11 +670,11 @@ def debugstate(ui, repo):
     for file_, ent in k:
         if ent[3] == -1:
             # Pad or slice to locale representation
-            locale_len = len(time.strftime("%x %X", time.localtime(0)))
+            locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(0)))
             timestr = 'unset'
             timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr))
         else:
-            timestr = time.strftime("%x %X", time.localtime(ent[3]))
+            timestr = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(ent[3]))
         if ent[1] & 020000:
             mode = 'lnk'
         else:
diff --git a/tests/test-convert-hg-sink.out b/tests/test-convert-hg-sink.out
--- a/tests/test-convert-hg-sink.out
+++ b/tests/test-convert-hg-sink.out
@@ -34,7 +34,7 @@ no changes found
 % dirstate should be empty:
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % put something in the dirstate:
-a   0         -1 unset             baz
+a   0         -1 unset               baz
 copy: bar -> baz
 % add a new revision in the original repo
 scanning source...
diff --git a/tests/test-filebranch b/tests/test-filebranch
--- a/tests/test-filebranch
+++ b/tests/test-filebranch
@@ -37,7 +37,7 @@ echo 2b > baz
 hg commit -m "branch b" -d "1000000 0"
 
 echo "we shouldn't have anything but n state here"
-hg debugstate | cut -b 1-16,35-
+hg debugstate | cut -b 1-16,37-
 
 echo merging
 hg pull ../a
@@ -48,7 +48,7 @@ echo 2b > baz
 echo new > quux
 
 echo "we shouldn't have anything but foo in merge state here"
-hg debugstate | cut -b 1-16,35- | grep "^m"
+hg debugstate | cut -b 1-16,37- | grep "^m"
 
 hg ci -m "merge" -d "1000000 0"
 
diff --git a/tests/test-issue522.out b/tests/test-issue522.out
--- a/tests/test-issue522.out
+++ b/tests/test-issue522.out
@@ -11,7 +11,7 @@ resolving manifests
 getting foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-n   0         -2 unset             foo
+n   0         -2 unset               foo
 M foo
 c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
    rev    offset  length   base linkrev nodeid       p1           p2
diff --git a/tests/test-rebuildstate b/tests/test-rebuildstate
--- a/tests/test-rebuildstate
+++ b/tests/test-rebuildstate
@@ -12,13 +12,13 @@ hg add baz
 hg rm bar
 
 echo '% state dump'
-hg debugstate | cut -b 1-16,35- | sort
+hg debugstate | cut -b 1-16,37- | sort
 echo '% status'
 hg st -A
 
 hg debugrebuildstate
 echo '% state dump'
-hg debugstate | cut -b 1-16,35- | sort
+hg debugstate | cut -b 1-16,37- | sort
 echo '% status'
 hg st -A