Remove more unnecessary imports from test scripts.

117 files changed, 61 insertions, 177 deletions

diff --git a/test/AR/AR.py b/test/AR/AR.py
index 2c0b1ae74..41105da9b 100644
--- a/test/AR/AR.py
+++ b/test/AR/AR.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AR/ARFLAGS.py b/test/AR/ARFLAGS.py
index 087cefeb3..87346599b 100644
--- a/test/AR/ARFLAGS.py
+++ b/test/AR/ARFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AS/ASCOM.py b/test/AS/ASCOM.py
index c2468066e..1be592c3c 100644
--- a/test/AS/ASCOM.py
+++ b/test/AS/ASCOM.py
@@ -29,7 +29,7 @@ Test the ability to configure the $ASCOM construction variable.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AS/ASCOMSTR.py b/test/AS/ASCOMSTR.py
index f1f64ee3b..eaa344a4f 100644
--- a/test/AS/ASCOMSTR.py
+++ b/test/AS/ASCOMSTR.py
@@ -30,7 +30,7 @@ the assembly output.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AS/ASFLAGS.py b/test/AS/ASFLAGS.py
index d7b7c33c7..5581b07ce 100644
--- a/test/AS/ASFLAGS.py
+++ b/test/AS/ASFLAGS.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py
index cb9d8dd91..d8fb3be52 100644
--- a/test/AS/ASPP.py
+++ b/test/AS/ASPP.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py
index b3c04a9f3..53f4addfd 100644
--- a/test/AS/ASPPCOM.py
+++ b/test/AS/ASPPCOM.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $ASPPCOM construction variable.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py
index 0e612ad95..20e3de00e 100644
--- a/test/AS/ASPPCOMSTR.py
+++ b/test/AS/ASPPCOMSTR.py
@@ -30,7 +30,7 @@ the displayed assembler string.
 """
 
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py
index b8fdf2ebd..e306c2274 100644
--- a/test/AS/ASPPFLAGS.py
+++ b/test/AS/ASPPFLAGS.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/AS/ml.py b/test/AS/ml.py
index af7fc176a..a731efb26 100644
--- a/test/AS/ml.py
+++ b/test/AS/ml.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify correct use of the live 'ml' assembler.
 """
 
-import os
 import string
 import sys
 
diff --git a/test/Actions/actions.py b/test/Actions/actions.py
index 79da38589..aae2bb918 100644
--- a/test/Actions/actions.py
+++ b/test/Actions/actions.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Actions/addpost-link.py b/test/Actions/addpost-link.py
index 0a94c7d0e..9c7966281 100644
--- a/test/Actions/addpost-link.py
+++ b/test/Actions/addpost-link.py
@@ -32,8 +32,6 @@ This is a test for fix of Issue 1004, reported by Matt Doar and
 packaged by Gary Oberbrunner.
 """
 
-import string
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Actions/pre-post.py b/test/Actions/pre-post.py
index 9ea397f07..e09ee028d 100644
--- a/test/Actions/pre-post.py
+++ b/test/Actions/pre-post.py
@@ -29,7 +29,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import stat
-import sys
+
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/Alias/Alias.py b/test/Alias/Alias.py
index 73cffc4d0..a5dd9037c 100644
--- a/test/Alias/Alias.py
+++ b/test/Alias/Alias.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 import TestCmd
 
diff --git a/test/Alias/Depends.py b/test/Alias/Depends.py
index bba0abd4c..a1129e478 100644
--- a/test/Alias/Depends.py
+++ b/test/Alias/Depends.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 import TestCmd
 
diff --git a/test/CC/CCCOM.py b/test/CC/CCCOM.py
index 474a930dd..6634e15ac 100644
--- a/test/CC/CCCOM.py
+++ b/test/CC/CCCOM.py
@@ -29,7 +29,7 @@ Test the ability to configure the $CCCOM construction variable.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CC/CCCOMSTR.py b/test/CC/CCCOMSTR.py
index f24f6c742..f66a192dc 100644
--- a/test/CC/CCCOMSTR.py
+++ b/test/CC/CCCOMSTR.py
@@ -30,7 +30,7 @@ the C compilation output.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CC/SHCC.py b/test/CC/SHCC.py
index db03d20ad..f80dfe5a7 100644
--- a/test/CC/SHCC.py
+++ b/test/CC/SHCC.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CC/SHCCCOM.py b/test/CC/SHCCCOM.py
index 44184b453..ab61035cb 100644
--- a/test/CC/SHCCCOM.py
+++ b/test/CC/SHCCCOM.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 """
diff --git a/test/CC/SHCCCOMSTR.py b/test/CC/SHCCCOMSTR.py
index c8daaf6c8..05c27ad47 100644
--- a/test/CC/SHCCCOMSTR.py
+++ b/test/CC/SHCCCOMSTR.py
@@ -30,7 +30,7 @@ the shared object C compilation output.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CFILESUFFIX.py b/test/CFILESUFFIX.py
index 1cce9e959..e167155b5 100644
--- a/test/CFILESUFFIX.py
+++ b/test/CFILESUFFIX.py
@@ -29,8 +29,7 @@ Verify that we can set CFILESUFFIX to arbitrary values.
 """
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index 4c594e5c4..346b4229b 100644
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -46,8 +46,6 @@ if sys.platform == 'win32':
 if sys.platform == 'win32':
 
     test.write('mylink.py', r"""
-import getopt
-import os
 import sys
 args = sys.argv[1:]
 while args:
@@ -68,7 +66,6 @@ else:
 
     test.write('mylink.py', r"""
 import getopt
-import os
 import sys
 opts, args = getopt.getopt(sys.argv[1:], 'o:s:')
 for opt, arg in opts:
diff --git a/test/CXX/CXXCOM.py b/test/CXX/CXXCOM.py
index be1bec49e..f623eaf29 100644
--- a/test/CXX/CXXCOM.py
+++ b/test/CXX/CXXCOM.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $CXXCOM construction variable.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CXX/CXXFILESUFFIX.py b/test/CXX/CXXFILESUFFIX.py
index 7d5609b42..749ca69dc 100644
--- a/test/CXX/CXXFILESUFFIX.py
+++ b/test/CXX/CXXFILESUFFIX.py
@@ -25,8 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CXX/SHCXX.py b/test/CXX/SHCXX.py
index 6c03b8f84..6351cfe50 100644
--- a/test/CXX/SHCXX.py
+++ b/test/CXX/SHCXX.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CXX/SHCXXCOM.py b/test/CXX/SHCXXCOM.py
index 972dad0a7..7c5e45f28 100644
--- a/test/CXX/SHCXXCOM.py
+++ b/test/CXX/SHCXXCOM.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $SHCXXCOM construction variable.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CXX/SHCXXCOMSTR.py b/test/CXX/SHCXXCOMSTR.py
index b9f20a8b7..afe647a8f 100644
--- a/test/CXX/SHCXXCOMSTR.py
+++ b/test/CXX/SHCXXCOMSTR.py
@@ -29,7 +29,6 @@ Test that the $SHCXXCOMSTR construction variable allows you to customize
 the shared object C++ compilation output.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Command.py b/test/Command.py
index ada2ae49b..f3be46ae3 100644
--- a/test/Command.py
+++ b/test/Command.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/CommandGenerator.py b/test/CommandGenerator.py
index 9348bddb4..063999dfa 100644
--- a/test/CommandGenerator.py
+++ b/test/CommandGenerator.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/D/DMD.py b/test/D/DMD.py
index fd7618286..497b6c5b6 100644
--- a/test/D/DMD.py
+++ b/test/D/DMD.py
@@ -24,8 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/DVIPDF/DVIPDF.py b/test/DVIPDF/DVIPDF.py
index 5317d5c11..b36615259 100644
--- a/test/DVIPDF/DVIPDF.py
+++ b/test/DVIPDF/DVIPDF.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 
 import TestSCons
diff --git a/test/DVIPDF/DVIPDFFLAGS.py b/test/DVIPDF/DVIPDFFLAGS.py
index 7d7079ccb..3d7bc72ec 100644
--- a/test/DVIPDF/DVIPDFFLAGS.py
+++ b/test/DVIPDF/DVIPDFFLAGS.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 
 import TestSCons
diff --git a/test/DVIPS/DVIPS.py b/test/DVIPS/DVIPS.py
index 84821a3af..7d32c973f 100644
--- a/test/DVIPS/DVIPS.py
+++ b/test/DVIPS/DVIPS.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 
 import TestSCons
diff --git a/test/DVIPS/DVIPSFLAGS.py b/test/DVIPS/DVIPSFLAGS.py
index de8322db1..61d247a6c 100644
--- a/test/DVIPS/DVIPSFLAGS.py
+++ b/test/DVIPS/DVIPSFLAGS.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 
 import TestSCons
diff --git a/test/Default.py b/test/Default.py
index 1b456610c..b8ccce27b 100644
--- a/test/Default.py
+++ b/test/Default.py
@@ -29,7 +29,7 @@ Verify various combinations of arguments to Default() work properly.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Deprecated/BuildDir.py b/test/Deprecated/BuildDir.py
index 26987cef6..02ef13978 100644
--- a/test/Deprecated/BuildDir.py
+++ b/test/Deprecated/BuildDir.py
@@ -85,7 +85,6 @@ SConscript('../build/var6/SConscript', "env")
 
 test.subdir(['work1', 'src'])
 test.write(['work1', 'src', 'SConscript'], """
-import os
 import os.path
 
 def buildIt(target, source, env):
diff --git a/test/ENV.py b/test/ENV.py
index f6d10129b..dc97ec82c 100644
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
 
 import TestSCons
 
diff --git a/test/Environment.py b/test/Environment.py
index 18a75dd3d..52b6488e4 100644
--- a/test/Environment.py
+++ b/test/Environment.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import sys
 
 _python_ = TestSCons._python_
 
diff --git a/test/IDL/midl.py b/test/IDL/midl.py
index bf4f58cf9..e716cacc6 100644
--- a/test/IDL/midl.py
+++ b/test/IDL/midl.py
@@ -24,12 +24,12 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestSCons
-import sys
 import os
-import TestCmd
+import sys
 
-test = TestSCons.TestSCons(match = TestCmd.match_re)
+import TestSCons
+
+test = TestSCons.TestSCons(match = TestSCons.match_re)
 
 if sys.platform != 'win32':
     msg = "Skipping test on non-Windows platform '%s'\n" % sys.platform
@@ -39,7 +39,6 @@ if sys.platform != 'win32':
 # Test the basics
 
 test.write('SConstruct',"""
-import os.path
 import os
 
 env = Environment(CPPPATH = '${TARGET.dir}',
@@ -56,8 +55,6 @@ SConscript(os.path.join('build2','SConscript'))
 test.subdir('src','build')
 
 test.write('src/SConscript',"""
-import os.path
-
 Import('env')
 
 local = env.Clone(WINDOWS_INSERT_DEF = 1)
diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index ca12ae4c1..b0b193e94 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index bb823fce5..06b19697a 100644
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -29,7 +29,6 @@ Test setting the JAVAC variable.
 """
 
 import os
-import sys
 
 import TestSCons
 
diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index 0abf5a4e5..5b6cf5fbb 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
 
 import TestSCons
 
diff --git a/test/LEX/LEX.py b/test/LEX/LEX.py
index 7964063b4..0ead71ac1 100644
--- a/test/LEX/LEX.py
+++ b/test/LEX/LEX.py
@@ -25,8 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LEX/LEXFLAGS.py b/test/LEX/LEXFLAGS.py
index 7d7aff171..aaabdf04f 100644
--- a/test/LEX/LEXFLAGS.py
+++ b/test/LEX/LEXFLAGS.py
@@ -25,8 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LINK/LINK.py b/test/LINK/LINK.py
index 851ddc9db..21e2d66c4 100644
--- a/test/LINK/LINK.py
+++ b/test/LINK/LINK.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LINK/LINKCOMSTR.py b/test/LINK/LINKCOMSTR.py
index 045574cdd..7e12c1df3 100644
--- a/test/LINK/LINKCOMSTR.py
+++ b/test/LINK/LINKCOMSTR.py
@@ -30,7 +30,7 @@ the displayed linker string.
 """
 
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LINK/LINKFLAGS.py b/test/LINK/LINKFLAGS.py
index 78385f1b2..172670903 100644
--- a/test/LINK/LINKFLAGS.py
+++ b/test/LINK/LINKFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LINK/SHLINK.py b/test/LINK/SHLINK.py
index c9be8bf8b..2bd9bd618 100644
--- a/test/LINK/SHLINK.py
+++ b/test/LINK/SHLINK.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LINK/SHLINKCOM.py b/test/LINK/SHLINKCOM.py
index 23b049c29..c507d316d 100644
--- a/test/LINK/SHLINKCOM.py
+++ b/test/LINK/SHLINKCOM.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $SHLINKCOM construction variable.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LINK/SHLINKFLAGS.py b/test/LINK/SHLINKFLAGS.py
index 924fafd71..ddd1a6c4d 100644
--- a/test/LINK/SHLINKFLAGS.py
+++ b/test/LINK/SHLINKFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/M4/M4.py b/test/M4/M4.py
index 9f877ee57..d12bb2863 100644
--- a/test/M4/M4.py
+++ b/test/M4/M4.py
@@ -30,7 +30,7 @@ Test that $M4 and $M4FLAGS work as expected.
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/MSVC/batch.py b/test/MSVC/batch.py
index bc65f8292..0ab116c7a 100644
--- a/test/MSVC/batch.py
+++ b/test/MSVC/batch.py
@@ -32,8 +32,6 @@ explicit suffix settings so that the test should work when run on any
 platform.
 """
 
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py
index 21e88d0f3..c8fa8dcba 100644
--- a/test/MSVC/msvc.py
+++ b/test/MSVC/msvc.py
@@ -29,7 +29,6 @@ Verify basic invocation of Microsoft Visual C/C++, including use
 of a precompiled header with the $CCFLAGS variable.
 """
 
-import os
 import sys
 import time
 
diff --git a/test/PRINT_CMD_LINE_FUNC.py b/test/PRINT_CMD_LINE_FUNC.py
index 45a741c0b..faa51ace7 100644
--- a/test/PRINT_CMD_LINE_FUNC.py
+++ b/test/PRINT_CMD_LINE_FUNC.py
@@ -28,14 +28,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the PRINT_CMD_LINE_FUNC construction variable.
 """
 
-import sys
-import TestCmd
 import TestSCons
 
 _exe = TestSCons._exe
 _obj = TestSCons._obj
 
-test = TestSCons.TestSCons(match = TestCmd.match_re)
+test = TestSCons.TestSCons(match = TestSCons.match_re)
 
 
 test.write('SConstruct', r"""
diff --git a/test/QT/QTFLAGS.py b/test/QT/QTFLAGS.py
index 87dcaf02d..2537c80c0 100644
--- a/test/QT/QTFLAGS.py
+++ b/test/QT/QTFLAGS.py
@@ -29,7 +29,6 @@ Testing the configuration mechanisms of the 'qt' tool.
 """
 
 import TestSCons
-import os.path
 
 _python_ = TestSCons._python_
 _exe = TestSCons._exe
diff --git a/test/RANLIB/RANLIB.py b/test/RANLIB/RANLIB.py
index eefbd157a..ecc6482d0 100644
--- a/test/RANLIB/RANLIB.py
+++ b/test/RANLIB/RANLIB.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/RANLIB/RANLIBFLAGS.py b/test/RANLIB/RANLIBFLAGS.py
index 45fcc00cc..123d403a8 100644
--- a/test/RANLIB/RANLIBFLAGS.py
+++ b/test/RANLIB/RANLIBFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Repository/M4.py b/test/Repository/M4.py
index b6c973608..b3ed75566 100644
--- a/test/Repository/M4.py
+++ b/test/Repository/M4.py
@@ -29,8 +29,7 @@ Test that $M4 and $M4FLAGS work with repositories.
 """
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index 7430ba73b..e8a7a1ff3 100644
--- a/test/Rpcgen/RPCGEN.py
+++ b/test/Rpcgen/RPCGEN.py
@@ -24,9 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index 7da011199..4b0d24f55 100644
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index 8f70adf9c..ddbc745df 100644
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index 840973fa9..3eac78f67 100644
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index db8f354d3..eee450537 100644
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index d185bcf89..c9a911adc 100644
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index f2d195551..5a695106f 100644
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -34,8 +34,6 @@ factors triggered the bug Scott saw, and partly because the real-world
 complexity is valuable in its own right.
 """
 
-import sys
-
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -53,10 +51,7 @@ test.write('SConstruct', """\
 ###
 
 experimenttop = r"%s"
-
 import os
-import os.path
-import string
 import Mylib
 
 BStaticLibMerge = Builder(generator = Mylib.Gen_StaticLibMerge)
diff --git a/test/TAR/TAR.py b/test/TAR/TAR.py
index f56a5e95d..80dea7a1d 100644
--- a/test/TAR/TAR.py
+++ b/test/TAR/TAR.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TAR/TARCOM.py b/test/TAR/TARCOM.py
index fcf458873..2a98d0644 100644
--- a/test/TAR/TARCOM.py
+++ b/test/TAR/TARCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $TARCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TAR/TARFLAGS.py b/test/TAR/TARFLAGS.py
index 40031ce64..e9940a85e 100644
--- a/test/TAR/TARFLAGS.py
+++ b/test/TAR/TARFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/LATEX.py b/test/TEX/LATEX.py
index a45b032b0..fff98dfed 100644
--- a/test/TEX/LATEX.py
+++ b/test/TEX/LATEX.py
@@ -30,9 +30,8 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py
index 9e4145c0d..8f4eaac27 100644
--- a/test/TEX/LATEX2.py
+++ b/test/TEX/LATEX2.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Validate that we can produce several .pdf at once from several sources.
 """
 
-import os
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/LATEXCOM.py b/test/TEX/LATEXCOM.py
index 81ab3debe..9d65134fc 100644
--- a/test/TEX/LATEXCOM.py
+++ b/test/TEX/LATEXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $LATEXCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/LATEXCOMSTR.py b/test/TEX/LATEXCOMSTR.py
index 0a212fe8a..9383e8785 100644
--- a/test/TEX/LATEXCOMSTR.py
+++ b/test/TEX/LATEXCOMSTR.py
@@ -29,8 +29,6 @@ Test that the $LATEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/LATEXFLAGS.py b/test/TEX/LATEXFLAGS.py
index ff1bf5265..8c4e7074f 100644
--- a/test/TEX/LATEXFLAGS.py
+++ b/test/TEX/LATEXFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFLATEX.py b/test/TEX/PDFLATEX.py
index 1d7f4499d..a7e68aacf 100644
--- a/test/TEX/PDFLATEX.py
+++ b/test/TEX/PDFLATEX.py
@@ -30,9 +30,8 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFLATEXCOM.py b/test/TEX/PDFLATEXCOM.py
index b05052ac0..36372a802 100644
--- a/test/TEX/PDFLATEXCOM.py
+++ b/test/TEX/PDFLATEXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $PDFLATEXCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFLATEXCOMSTR.py b/test/TEX/PDFLATEXCOMSTR.py
index 2e9ba8a77..e91ba8733 100644
--- a/test/TEX/PDFLATEXCOMSTR.py
+++ b/test/TEX/PDFLATEXCOMSTR.py
@@ -30,8 +30,6 @@ Test that the $PDFLATEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFLATEXFLAGS.py b/test/TEX/PDFLATEXFLAGS.py
index f007277f7..19c7e5a95 100644
--- a/test/TEX/PDFLATEXFLAGS.py
+++ b/test/TEX/PDFLATEXFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFTEX.py b/test/TEX/PDFTEX.py
index 61fac1e9b..1562b20d6 100644
--- a/test/TEX/PDFTEX.py
+++ b/test/TEX/PDFTEX.py
@@ -30,9 +30,8 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFTEXCOM.py b/test/TEX/PDFTEXCOM.py
index b6b587530..6d57f2c24 100644
--- a/test/TEX/PDFTEXCOM.py
+++ b/test/TEX/PDFTEXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $PDFTEXCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFTEXCOMSTR.py b/test/TEX/PDFTEXCOMSTR.py
index e1fbc5c8d..8caa4e379 100644
--- a/test/TEX/PDFTEXCOMSTR.py
+++ b/test/TEX/PDFTEXCOMSTR.py
@@ -30,8 +30,6 @@ Test that the $PDFTEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFTEXFLAGS.py b/test/TEX/PDFTEXFLAGS.py
index eb78ec8f5..d1b82fe0f 100644
--- a/test/TEX/PDFTEXFLAGS.py
+++ b/test/TEX/PDFTEXFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py
index 3b2a6bece..99a69fe58 100644
--- a/test/TEX/TEX.py
+++ b/test/TEX/TEX.py
@@ -30,9 +30,8 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/TEXCOM.py b/test/TEX/TEXCOM.py
index 0224341bc..6336730e0 100644
--- a/test/TEX/TEXCOM.py
+++ b/test/TEX/TEXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $TEXCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/TEXCOMSTR.py b/test/TEX/TEXCOMSTR.py
index 6c0e1f9da..d4ebe5739 100644
--- a/test/TEX/TEXCOMSTR.py
+++ b/test/TEX/TEXCOMSTR.py
@@ -29,8 +29,6 @@ Test that the $TEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/TEXFLAGS.py b/test/TEX/TEXFLAGS.py
index 1f9a2e1eb..efb66061a 100644
--- a/test/TEX/TEXFLAGS.py
+++ b/test/TEX/TEXFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/dryrun.py b/test/TEX/dryrun.py
index bf1088f60..adbc0b6ac 100644
--- a/test/TEX/dryrun.py
+++ b/test/TEX/dryrun.py
@@ -30,8 +30,6 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/rename_result.py b/test/TEX/rename_result.py
index 678d6da84..0f098d08c 100644
--- a/test/TEX/rename_result.py
+++ b/test/TEX/rename_result.py
@@ -29,8 +29,6 @@ Validate that we can rename the output from latex to the
 target name provided by the user.
 """
 
-import os
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/usepackage.py b/test/TEX/usepackage.py
index 136864c86..aa7e79f54 100644
--- a/test/TEX/usepackage.py
+++ b/test/TEX/usepackage.py
@@ -30,8 +30,6 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Value.py b/test/Value.py
index f4ed21952..9f0645ecb 100644
--- a/test/Value.py
+++ b/test/Value.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import re
-import sys
 
 import TestSCons
 import TestCmd
diff --git a/test/VariantDir/VariantDir.py b/test/VariantDir/VariantDir.py
index f2c0a7c9d..396f6a9f2 100644
--- a/test/VariantDir/VariantDir.py
+++ b/test/VariantDir/VariantDir.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import string
-import sys
+
 import TestSCons
 
 _exe = TestSCons._exe
@@ -91,7 +91,6 @@ SConscript('../build/var6/SConscript', "env")
 
 test.subdir(['work1', 'src'])
 test.write(['work1', 'src', 'SConscript'], """
-import os
 import os.path
 
 def buildIt(target, source, env):
diff --git a/test/YACC/YACC.py b/test/YACC/YACC.py
index c0a0f347b..a9ef57cb8 100644
--- a/test/YACC/YACC.py
+++ b/test/YACC/YACC.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/YACC/YACCFLAGS.py b/test/YACC/YACCFLAGS.py
index e0f5e5ae6..f36cb944c 100644
--- a/test/YACC/YACCFLAGS.py
+++ b/test/YACC/YACCFLAGS.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/ZIP/ZIP.py b/test/ZIP/ZIP.py
index fffb493bd..60f3dad1f 100644
--- a/test/ZIP/ZIP.py
+++ b/test/ZIP/ZIP.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import os
 import stat
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/ZIP/ZIPCOM.py b/test/ZIP/ZIPCOM.py
index c1f6761c2..6c78824e8 100644
--- a/test/ZIP/ZIPCOM.py
+++ b/test/ZIP/ZIPCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $ZIPCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/builderrors.py b/test/builderrors.py
index 733b539f8..72b856f3f 100644
--- a/test/builderrors.py
+++ b/test/builderrors.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
 
 import TestSCons
 
diff --git a/test/exceptions.py b/test/exceptions.py
index 12a343092..6a68c79a6 100644
--- a/test/exceptions.py
+++ b/test/exceptions.py
@@ -25,14 +25,12 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import re
-import sys
 
-import TestCmd
 import TestSCons
 
 _python_ = TestSCons._python_
 
-test = TestSCons.TestSCons(match = TestCmd.match_re_dotall)
+test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
 SConstruct_path = test.workpath('SConstruct')
 
diff --git a/test/explain/basic.py b/test/explain/basic.py
index 93d761b5e..881f01d44 100644
--- a/test/explain/basic.py
+++ b/test/explain/basic.py
@@ -30,7 +30,6 @@ Verify a lot of the basic operation of the --debug=explain option.
 
 import os
 import string
-import sys
 
 import TestSCons
 
diff --git a/test/file-names.py b/test/file-names.py
index b7fd043e1..95b4e4ecb 100644
--- a/test/file-names.py
+++ b/test/file-names.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/ignore-command.py b/test/ignore-command.py
index 0b5429a73..134314559 100644
--- a/test/ignore-command.py
+++ b/test/ignore-command.py
@@ -29,7 +29,7 @@ Test use of a preceding - to ignore the return value from a command.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
index 272be146d..8e391c1ac 100644
--- a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
+++ b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
@@ -30,8 +30,6 @@ whether or not the implicit dependency on executed commands
 is added to targets.
 """
 
-import os
-
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/multiline.py b/test/multiline.py
index 18fc9b59c..18b2f21ea 100644
--- a/test/multiline.py
+++ b/test/multiline.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/option--.py b/test/option--.py
index 78bb8d229..3c932c06b 100644
--- a/test/option--.py
+++ b/test/option--.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
 
 import TestSCons
 
diff --git a/test/option--Q.py b/test/option--Q.py
index 46a047ec3..4322bcd04 100644
--- a/test/option--Q.py
+++ b/test/option--Q.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
 
 import TestSCons
 
diff --git a/test/option--max-drift.py b/test/option--max-drift.py
index 87a5ffe59..08fafd196 100644
--- a/test/option--max-drift.py
+++ b/test/option--max-drift.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option-c.py b/test/option-c.py
index 6ea4e58ae..e71c7c2bf 100644
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -29,7 +29,6 @@ Test various uses of the -c (clean) option.
 """
 
 import os
-import sys
 
 import TestSCons
 
diff --git a/test/option-i.py b/test/option-i.py
index a1b3a98f2..b32bd9cdd 100644
--- a/test/option-i.py
+++ b/test/option-i.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option-j.py b/test/option-j.py
index 316340e54..83597cafb 100644
--- a/test/option-j.py
+++ b/test/option-j.py
@@ -31,7 +31,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option-k.py b/test/option-k.py
index 588b3310f..a367c6534 100644
--- a/test/option-k.py
+++ b/test/option-k.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option-n.py b/test/option-n.py
index 6fb805804..abb028451 100644
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -41,9 +41,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import re
-import sys
 
-import TestCmd
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -170,7 +168,7 @@ test.fail_test(os.path.exists(test.workpath('build', 'f4.in')))
 
 # test Configure-calls in conjunction with -n
 test.subdir('configure')
-test.match_func = TestCmd.match_re_dotall
+test.match_func = TestSCons.match_re_dotall
 test.write('configure/SConstruct',
 """def CustomTest(context):
     def userAction(target,source,env):
diff --git a/test/option-s.py b/test/option-s.py
index c875495ce..6950fc986 100644
--- a/test/option-s.py
+++ b/test/option-s.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
 
 import TestSCons
 
diff --git a/test/option/debug-time.py b/test/option/debug-time.py
index edd3ea5e4..d9ca23720 100644
--- a/test/option/debug-time.py
+++ b/test/option/debug-time.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import sys
 import string
 import re
 import time
diff --git a/test/option/md5-chunksize.py b/test/option/md5-chunksize.py
index 43faf933b..9d15e8411 100644
--- a/test/option/md5-chunksize.py
+++ b/test/option/md5-chunksize.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import string
-import sys
 
 import TestSCons
 
diff --git a/test/packaging/msi/package.py b/test/packaging/msi/package.py
index 0de241ed8..4988742da 100644
--- a/test/packaging/msi/package.py
+++ b/test/packaging/msi/package.py
@@ -51,8 +51,6 @@ test.write( 'file1.exe', "file1" )
 test.write( 'file2.exe', "file2" )
 
 test.write('SConstruct', """
-import os
-
 env  = Environment(tools=['default', 'packaging'])
 
 f1  = env.Install( '/usr/' , 'file1.exe'  )
@@ -96,7 +94,6 @@ test.write( 'file4.dll', "file4" )
 test.write( 'file5.dll', "file5" )
 
 test.write('SConstruct', """
-import os
 env = Environment(tools=['default', 'packaging'])
 f1  = env.Install( '/usr/' , 'file1.exe'  )
 f2  = env.Install( '/usr/' , 'file2.exe'  )
diff --git a/test/sconsign/script/SConsignFile.py b/test/sconsign/script/SConsignFile.py
index 2bf1d078e..e974c67cc 100644
--- a/test/sconsign/script/SConsignFile.py
+++ b/test/sconsign/script/SConsignFile.py
@@ -29,7 +29,6 @@ Verify that the sconsign script works with files generated when
 using the signatures in an SConsignFile().
 """
 
-import os
 import re
 
 import TestSCons
diff --git a/test/silent-command.py b/test/silent-command.py
index a5d03d6dc..7704ee599 100644
--- a/test/silent-command.py
+++ b/test/silent-command.py
@@ -29,7 +29,6 @@ Test the use of a preceding @ to suppress printing a command.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
 
 import TestSCons
 
diff --git a/test/site_scons/sys-path.py b/test/site_scons/sys-path.py
index fda723074..46f84c76a 100644
--- a/test/site_scons/sys-path.py
+++ b/test/site_scons/sys-path.py
@@ -44,13 +44,11 @@ print "Imported site_scons/testmod2.py."
 """)
 
 test.write(['sub1', 'SConscript'], """
-import sys
 import testmod2 # This call did not work before the fix
 
 """)
 
 test.write('SConstruct', """
-import sys
 import testmod1 # this always worked
 SConscript('sub1/SConscript')
 """)
diff --git a/test/special-filenames.py b/test/special-filenames.py
index 91bb51710..86a6e59c6 100644
--- a/test/special-filenames.py
+++ b/test/special-filenames.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import string
-import sys
 
 import TestSCons