diff --git a/pisi/xmlfile.py b/pisi/xmlfile.py
index bbc1fd2c..bc3a5bec 100644
--- a/pisi/xmlfile.py
+++ b/pisi/xmlfile.py
@@ -110,7 +110,7 @@ class LocalText(object):
             # fallback to Turkish
             return self.locs['tr']
         else:
-            errs.append("Tag '%s' should have at least an English or Turkish version\n" % d[2])
+            errs.append(_("Tag should have at least an English or Turkish version"))
             return ''
 
     # FIXME: use something like the below to return a default
@@ -216,7 +216,9 @@ class autoxml(type):
         decoders = []
         encoders = []
         formatters = []
-        for var in dict:
+        order = dict.keys()
+        order.sort()
+        for var in order:
             if var.startswith('t_') or var.startswith('a_'):
                 name = var[2:]
                 if var.startswith('a_'):
diff --git a/tests/run.py b/tests/run.py
index 1cca4e1c..0ba5e13d 100755
--- a/tests/run.py
+++ b/tests/run.py
@@ -13,6 +13,7 @@
 import unittest
 import sys
 import os
+import locale
 
 sys.path.append('.')
 sys.path.append('..')
@@ -59,6 +60,7 @@ def run_all():
     runTestSuite(alltests)
 
 if __name__ == "__main__":
+    locale.setlocale(locale.LC_ALL, '')
     args = sys.argv
     if len(args) > 1: # run modules given from the command line
         tests = sys.argv[1:]