diff --git a/SCons/Config/default b/SCons/Config/default
index 5cd58dca..6fbcc4b2 100644
--- a/SCons/Config/default
+++ b/SCons/Config/default
@@ -33,6 +33,10 @@ util_env = defenv.Copy()
 
 cp_util_env = util_env.Copy()
 
+### test environment
+
+test_env = defenv.Copy()
+
 # return
 
-Return('stub_env makensis_env plugin_env util_env cp_util_env')
+Return('stub_env makensis_env plugin_env util_env cp_util_env test_env')
diff --git a/SCons/Config/gnu b/SCons/Config/gnu
index ae3449df..a2136cb0 100644
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -101,6 +101,10 @@ cross_env(util_env)
 util_env.Append(LINKFLAGS = '-mwindows')          # build windows executables
 util_env.Append(LINKFLAGS = '$ALIGN_FLAG')        # 512 bytes align
 
+### test environment
+
+test_env = defenv.Copy()
+
 ### weird GCC requirements
 
 #
@@ -239,8 +243,9 @@ def check_big_endian(ctx):
 conf = defenv.Configure(custom_tests = { 'CheckBigEndian' : check_big_endian })
 if conf.CheckBigEndian():
 	makensis_env.Append(CPPDEFINES = ['__BIG_ENDIAN__'])
+	test_env.Append(CPPDEFINES = ['__BIG_ENDIAN__'])
 conf.Finish()
 
 ### return
 
-Return('stub_env makensis_env plugin_env util_env cp_util_env')
+Return('stub_env makensis_env plugin_env util_env cp_util_env test_env')
diff --git a/SCons/Config/ms b/SCons/Config/ms
index 9502b5e1..2ee5cf63 100644
--- a/SCons/Config/ms
+++ b/SCons/Config/ms
@@ -112,6 +112,10 @@ util_env.Append(LINKFLAGS = '$MAP_FLAG')      # generate map file
 
 cp_util_env = util_env.Copy()
 
+### test environment
+
+test_env = defenv.Copy()
+
 # return
 
-Return('stub_env makensis_env plugin_env util_env cp_util_env')
+Return('stub_env makensis_env plugin_env util_env cp_util_env test_env')
diff --git a/SConstruct b/SConstruct
index d207cbfc..1a3d05ef 100644
--- a/SConstruct
+++ b/SConstruct
@@ -281,6 +281,7 @@ makensis_env = envs[1]
 plugin_env = envs[2]
 util_env = envs[3]
 cp_util_env = envs[4]
+test_env = envs[5]
 
 ######################################################################
 #######  Distribution                                              ###
@@ -566,7 +567,7 @@ for i in misc:
 # test code
 
 build_dir = '$BUILD_PREFIX/tests'
-exports = {'env' : defenv.Copy()}
+exports = {'env' : test_env.Copy()}
 
 defenv.SConscript(
 	dirs = 'Source/Tests',
@@ -579,9 +580,9 @@ defenv.Ignore('$BUILD_PREFIX', '$BUILD_PREFIX/tests')
 
 # test scripts
 
-test_env = defenv.Copy(ENV = os.environ) # env needed for some scripts
-test_env['ENV']['NSISDIR'] = os.path.abspath(str(defenv['TESTDISTDIR']))
-test_env['ENV']['NSISCONFDIR'] = os.path.abspath(str(defenv['TESTDISTDIR']))
+test_scripts_env = defenv.Copy(ENV = os.environ) # env needed for some scripts
+test_scripts_env['ENV']['NSISDIR'] = os.path.abspath(str(defenv['TESTDISTDIR']))
+test_scripts_env['ENV']['NSISCONFDIR'] = os.path.abspath(str(defenv['TESTDISTDIR']))
 
 def test_scripts(target, source, env):
 	from os import walk, sep
@@ -600,8 +601,8 @@ def test_scripts(target, source, env):
 
 	return None
 
-test = test_env.Command('test-scripts.log', '$TESTDISTDIR', test_scripts)
-test_env.Alias('test-scripts', test)
+test = test_scripts_env.Command('test-scripts.log', '$TESTDISTDIR', test_scripts)
+test_scripts_env.Alias('test-scripts', test)
 
 # test all