--- a/tests/ChangeLog	Mon Aug 10 16:22:09 2009 +0100
+++ b/tests/ChangeLog	Mon Aug 10 16:25:08 2009 +0100
@@ -1,3 +1,10 @@
+2009-08-10  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* automated/mule-tests.el: 
+	Revert to the original language environment once we've tested all
+	the others, preventing things like a Chinese terminal coding
+	system being selected when you actually have a UTF-8 tty.
+
 2009-07-13  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* automated/mule-tests.el: 

--- a/tests/automated/mule-tests.el	Mon Aug 10 16:22:09 2009 +0100
+++ b/tests/automated/mule-tests.el	Mon Aug 10 16:25:08 2009 +0100
@@ -575,6 +575,7 @@
     for language in (mapcar #'car language-info-alist)
     with language-input-method = nil
     with native-coding-system = nil
+    with original-language-environment = current-language-environment
     do
     ;; s-l-e can call #'require, which says "Loading ..."
     (Silence-Message (set-language-environment language))
@@ -613,7 +614,8 @@
       ;; We don't have the appropriate POSIX locales to test with a
       ;; native-coding-system that is a function.
       (unless (functionp coding-system)
-	(Assert (coding-system-p (find-coding-system coding-system))))))
+	(Assert (coding-system-p (find-coding-system coding-system)))))
+    finally (set-language-environment original-language-environment))
 
   (with-temp-buffer
     (flet