diff --git a/master.cfg b/master.cfg
index 90dd9a0..f991b57 100644
--- a/master.cfg
+++ b/master.cfg
@@ -823,6 +823,7 @@ BuildBot halt on failure."""
         steps.ShellCommand.__init__ (self, decodeRC = { 0 : SUCCESS,
                                                         1 : SUCCESS,
                                                         2 : SUCCESS },
+                                     env = test_env,
                                      **kwargs)
 
         self.workdir = util.Interpolate ("%(prop:builddir)s/build/gdb/testsuite")
@@ -830,7 +831,7 @@ BuildBot halt on failure."""
                         '-k',
                         'check'] + extra_make_check_flags
 
-        self.env = test_env
+#        self.env = test_env
         # Needed because of dejagnu
         self.haltOnFailure = False
         self.flunkOnFailure = False