diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java
index 65418a291d533fadfdf78d51888526edabea4760..3b87bd4f93339f0975e41d4150ad8a7d2e798622 100644
--- a/core/src/main/java/hudson/EnvVars.java
+++ b/core/src/main/java/hudson/EnvVars.java
@@ -1,8 +1,10 @@
 package hudson;
 
 import java.io.File;
-import java.util.HashMap;
+import java.io.Serializable;
 import java.util.Map;
+import java.util.TreeMap;
+import java.util.Comparator;
 
 /**
  * Environment variables.
@@ -17,13 +19,15 @@ import java.util.Map;
  * 
  * @author Kohsuke Kawaguchi
  */
-public class EnvVars extends HashMap<String,String> {
+public class EnvVars extends TreeMap<String,String> {
 
     public EnvVars() {
+        super(CASE_INSENSITIVE_COMPARATOR);
     }
 
     public EnvVars(Map<String,String> m) {
-        super(m);
+        super(CASE_INSENSITIVE_COMPARATOR);
+        putAll(m);
     }
 
     /**
@@ -61,4 +65,16 @@ public class EnvVars extends HashMap<String,String> {
      * Environmental variables that we've inherited.
      */
     public static final Map<String,String> masterEnvVars = System.getenv();
+
+    /**
+     * Compares strings case insensitively.
+     */
+    private static final Comparator<String> CASE_INSENSITIVE_COMPARATOR = new CaseInsensitiveComparator();
+
+    private static class CaseInsensitiveComparator implements Comparator<String>, Serializable {
+        public int compare(String lhs, String rhs) {
+            return lhs.compareToIgnoreCase(rhs);
+        }
+        private static final long serialVersionUID = 1L;
+    }
 }
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 23a7750b494c124dea6f1c165fd0b74eb847f64b..048dc8f9c66184f2be729cf12cb5c53386fc6e16 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -2,6 +2,7 @@ package hudson.model;
 
 import com.thoughtworks.xstream.XStream;
 import hudson.CloseProofOutputStream;
+import hudson.EnvVars;
 import hudson.ExtensionPoint;
 import hudson.FeedAdapter;
 import hudson.FilePath;
@@ -30,7 +31,6 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Writer;
-import java.io.Serializable;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -929,7 +929,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
      *
      */
     public Map<String,String> getEnvVars() {
-        Map<String,String> env = new TreeMap<String,String>(CASE_INSENSITIVE_COMPARATOR);
+        EnvVars env = new EnvVars();
         env.put("BUILD_NUMBER",String.valueOf(number));
         env.put("BUILD_ID",getId());
         env.put("BUILD_TAG","hudson-"+getParent().getName()+"-"+number);
@@ -1005,16 +1005,4 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
         public String getUrlName() { return null; }
         public String getWhyKeepLog() { return Run.this.getWhyKeepLog(); }
     }
-
-    /**
-     * Compares strings case insensitively.
-     */
-    private static final Comparator<String> CASE_INSENSITIVE_COMPARATOR = new CaseInsensitiveComparator();
-
-    private static class CaseInsensitiveComparator implements Comparator<String>, Serializable {
-        public int compare(String lhs, String rhs) {
-            return lhs.compareToIgnoreCase(rhs);
-        }
-        private static final long serialVersionUID = 1L;
-    }
 }
diff --git a/core/src/main/resources/hudson/scm/SubversionSCM/config.jelly b/core/src/main/resources/hudson/scm/SubversionSCM/config.jelly
index 68dd314d7084292b44e22e98dd5f5c77a5d28561..665753b3070de3bc3561a753c59b16d5784956cc 100644
--- a/core/src/main/resources/hudson/scm/SubversionSCM/config.jelly
+++ b/core/src/main/resources/hudson/scm/SubversionSCM/config.jelly
@@ -8,7 +8,7 @@
         </f:entry>
         <f:entry title="Local module directory (optional)" help="/help/subversion/local.html">
           <f:textbox name="svn.location_local" value="${loc.local}"
-            checkUrl="'${rootURL}/scm/SubversionSCM/svnLocalLocationCheck?value='+escape(this.value)"/>     
+            checkUrl="'${rootURL}/scm/SubversionSCM/svnLocalLocationCheck?value='+escape(this.value)"/>
         </f:entry>
         <f:entry>
           <div align="right">