diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index caf616ab92..164cdb6fe1 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -4,3 +4,5 @@
 fbb026ef1145fe29e0ec3c1b66a3e99cac51e18d
 # Black/Ruff'd test framework code.
 c9d9fa58b796532320a2248ddc5be07b7280adf3
+# Purge vim/emac variable bloat
+ad7207090187a6cd2657cce00096cfc4bc9c3010
diff --git a/CHANGES.txt b/CHANGES.txt
index 35dccd703a..d1231d9680 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From John Doe:
     - Whatever John Doe did.
 
+  From Thaddeus Crews:
+    - Purge vim/emac local variable bloat.
+
   From William Deegan:
     - Fix SCons Docbook schema to work with lxml > 5
     - Update pyproject.toml to support Python 3.14 and remove restrictions on lxml version install
diff --git a/RELEASE.txt b/RELEASE.txt
index 3dc84ba3e9..21063fafc2 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -75,6 +75,7 @@ DEVELOPMENT
 
 - Introduce some unit tests for the file locking utility routines
 
+- Purge vim/emac local variable bloat.
 - Update pyproject.toml to support Python 3.14 and remove restrictions on lxml version install
 
 
diff --git a/ReleaseConfig b/ReleaseConfig
index bf9e6f3486..c9b91232b7 100755
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -51,9 +51,3 @@ deprecated_python_version = (3, 7, 0)
 
 # If copyright years is not given, the release year is used as the end.
 copyright_years = '2001 - 2025'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Action.py b/SCons/Action.py
index 18a488a78d..ee43d8805c 100644
--- a/SCons/Action.py
+++ b/SCons/Action.py
@@ -1611,9 +1611,3 @@ def __call__(self, *args, **kw):
         ac = ActionCaller(self, args, kw)
         action = Action(ac, strfunction=ac.strfunction)
         return action
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/ActionTests.py b/SCons/ActionTests.py
index 8cdcc817dc..7b142be164 100644
--- a/SCons/ActionTests.py
+++ b/SCons/ActionTests.py
@@ -2403,9 +2403,3 @@ def test_scons_subproc_run(self):
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Builder.py b/SCons/Builder.py
index d4d693bb6b..769cdd186b 100644
--- a/SCons/Builder.py
+++ b/SCons/Builder.py
@@ -910,9 +910,3 @@ def is_a_Builder(obj) -> bool:
     return (isinstance(obj, BuilderBase)
             or isinstance(obj, CompositeBuilder)
             or callable(obj))
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/BuilderTests.py b/SCons/BuilderTests.py
index f4c91f991b..26f0aa66ba 100644
--- a/SCons/BuilderTests.py
+++ b/SCons/BuilderTests.py
@@ -1661,9 +1661,3 @@ def test_src_builder(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/CacheDir.py b/SCons/CacheDir.py
index a5184b6e9c..b91ddc633e 100644
--- a/SCons/CacheDir.py
+++ b/SCons/CacheDir.py
@@ -396,9 +396,3 @@ def push(self, node):
     def push_if_forced(self, node):
         if cache_force:
             return self.push(node)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/CacheDirTests.py b/SCons/CacheDirTests.py
index 0ecd502a13..ab736a1c67 100644
--- a/SCons/CacheDirTests.py
+++ b/SCons/CacheDirTests.py
@@ -372,8 +372,3 @@ def test_no_strfunction(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Conftest.py b/SCons/Conftest.py
index 79ede99689..5041f24d54 100644
--- a/SCons/Conftest.py
+++ b/SCons/Conftest.py
@@ -859,12 +859,3 @@ def _lang2suffix(lang):
         return ("C++", ".cpp", None)
 
     return None, None, "Unsupported language: %s" % lang
-
-
-# vim: set sw=4 et sts=4 tw=79 fo+=l:
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Debug.py b/SCons/Debug.py
index 9a6433ee89..24c971f73b 100644
--- a/SCons/Debug.py
+++ b/SCons/Debug.py
@@ -246,9 +246,3 @@ def trace_cleanup(traceFP) -> None:
         PreviousTime = now
     fp.write(msg)
     fp.flush()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Defaults.py b/SCons/Defaults.py
index d971d060f6..c8f73eb160 100644
--- a/SCons/Defaults.py
+++ b/SCons/Defaults.py
@@ -751,9 +751,3 @@ def __lib_either_version_flag(env, version_var1, version_var2, flags_var):
     'File': Variable_Method_Caller('TARGET', 'File'),
     'RDirs': Variable_Method_Caller('TARGET', 'RDirs'),
 }
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/DefaultsTests.py b/SCons/DefaultsTests.py
index a59b8b0098..ea25d25b98 100644
--- a/SCons/DefaultsTests.py
+++ b/SCons/DefaultsTests.py
@@ -155,9 +155,3 @@ def test_processDefines(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Environment.py b/SCons/Environment.py
index d6db175ac4..35aa5c6df8 100644
--- a/SCons/Environment.py
+++ b/SCons/Environment.py
@@ -2904,9 +2904,3 @@ def subst_target_source(self, string, *args, **kwargs):
             return SCons.Subst.scons_subst(*nargs, **nkw)
 
     return _NoSubstitutionProxy(subject)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/EnvironmentTests.py b/SCons/EnvironmentTests.py
index f9f0000641..6618a58dcc 100644
--- a/SCons/EnvironmentTests.py
+++ b/SCons/EnvironmentTests.py
@@ -4331,9 +4331,3 @@ def test_subst_target_source(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Errors.py b/SCons/Errors.py
index af77971032..d5581a83b4 100644
--- a/SCons/Errors.py
+++ b/SCons/Errors.py
@@ -214,9 +214,3 @@ def convert_to_BuildError(status, exc_info=None):
     #import sys
     #sys.stderr.write("convert_to_BuildError: status %s => (errstr %s, status %s)\n"%(status,buildError.errstr, buildError.status))
     return buildError
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/ErrorsTests.py b/SCons/ErrorsTests.py
index 4241750e3e..6649389e7e 100644
--- a/SCons/ErrorsTests.py
+++ b/SCons/ErrorsTests.py
@@ -142,9 +142,3 @@ def __init__(self, name):
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Executor.py b/SCons/Executor.py
index f33a7aa8dc..95649593f9 100644
--- a/SCons/Executor.py
+++ b/SCons/Executor.py
@@ -654,9 +654,3 @@ def add_post_action(self, action) -> None:
     def set_action_list(self, action) -> None:
         self._morph()
         self.set_action_list(action)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/ExecutorTests.py b/SCons/ExecutorTests.py
index 7e5df1441f..b0d2e52c29 100644
--- a/SCons/ExecutorTests.py
+++ b/SCons/ExecutorTests.py
@@ -479,9 +479,3 @@ def test_changed_sources_for_alwaysBuild(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Memoize.py b/SCons/Memoize.py
index 42e52c4ac7..ed6b340b95 100644
--- a/SCons/Memoize.py
+++ b/SCons/Memoize.py
@@ -234,9 +234,3 @@ def wrapper(self, *args, **kwargs):
         else:
             return fn
     return decorator
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/MemoizeTests.py b/SCons/MemoizeTests.py
index 825256ccfa..bff462b400 100644
--- a/SCons/MemoizeTests.py
+++ b/SCons/MemoizeTests.py
@@ -161,9 +161,3 @@ def test___call__(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Node/Alias.py b/SCons/Node/Alias.py
index 6041581781..1c94b99446 100644
--- a/SCons/Node/Alias.py
+++ b/SCons/Node/Alias.py
@@ -142,9 +142,3 @@ def get_csig(self):
 default_ans = AliasNameSpace()
 
 SCons.Node.arg2nodes_lookups.append(default_ans.lookup)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Node/AliasTests.py b/SCons/Node/AliasTests.py
index 78138f93a2..0ac575765a 100644
--- a/SCons/Node/AliasTests.py
+++ b/SCons/Node/AliasTests.py
@@ -109,9 +109,3 @@ def test___init__(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Node/FS.py b/SCons/Node/FS.py
index 8c1e6e5822..8504f76f10 100644
--- a/SCons/Node/FS.py
+++ b/SCons/Node/FS.py
@@ -3852,9 +3852,3 @@ def invalidate_node_memos(targets) -> None:
             node = get_default_fs().Entry(entry)
             if node:
                 node.clear_memoized_values()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Node/FSTests.py b/SCons/Node/FSTests.py
index a06cd0cc2f..9d05386391 100644
--- a/SCons/Node/FSTests.py
+++ b/SCons/Node/FSTests.py
@@ -4094,9 +4094,3 @@ def runTest(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Node/NodeTests.py b/SCons/Node/NodeTests.py
index d8288f4c9a..73db5276d2 100644
--- a/SCons/Node/NodeTests.py
+++ b/SCons/Node/NodeTests.py
@@ -1377,10 +1377,3 @@ def test___str__(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Node/Python.py b/SCons/Node/Python.py
index c057b8d5ca..9fe75890c9 100644
--- a/SCons/Node/Python.py
+++ b/SCons/Node/Python.py
@@ -162,10 +162,3 @@ def ValueWithMemo(value, built_value=None, name=None):
         v = Value(value, built_value, name)
         _memo_lookup_map[memo_lookup_key] = v
         return v
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Node/PythonTests.py b/SCons/Node/PythonTests.py
index 95ea0d51e3..738d3d4607 100644
--- a/SCons/Node/PythonTests.py
+++ b/SCons/Node/PythonTests.py
@@ -191,9 +191,3 @@ def test_value_set_name(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Node/__init__.py b/SCons/Node/__init__.py
index 12c03ca253..5214d378c8 100644
--- a/SCons/Node/__init__.py
+++ b/SCons/Node/__init__.py
@@ -1799,9 +1799,3 @@ def is_done(self) -> bool:
 
 
 arg2nodes_lookups = []
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/PathList.py b/SCons/PathList.py
index fcda3c59af..d2f32bf7d6 100644
--- a/SCons/PathList.py
+++ b/SCons/PathList.py
@@ -219,9 +219,3 @@ def PathList(self, pathlist, split=True):
 # TODO: removing the class object here means Sphinx doesn't pick up its
 #   docstrings: they're fine for reading here, but are not in API Docs.
 del PathListCache
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/PathListTests.py b/SCons/PathListTests.py
index 78fd1a4956..4aaf266a62 100644
--- a/SCons/PathListTests.py
+++ b/SCons/PathListTests.py
@@ -185,9 +185,3 @@ def test_PathList(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/PlatformTests.py b/SCons/Platform/PlatformTests.py
index 691aed2598..a15296b1a1 100644
--- a/SCons/Platform/PlatformTests.py
+++ b/SCons/Platform/PlatformTests.py
@@ -333,10 +333,3 @@ def test_posix_escape(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/__init__.py b/SCons/Platform/__init__.py
index ac30c25542..ab87c6f229 100644
--- a/SCons/Platform/__init__.py
+++ b/SCons/Platform/__init__.py
@@ -373,9 +373,3 @@ def Platform(name = platform_default()):
     module = platform_module(name)
     spec = PlatformSpec(name, module.generate)
     return spec
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/aix.py b/SCons/Platform/aix.py
index 1136226268..b938e7919f 100644
--- a/SCons/Platform/aix.py
+++ b/SCons/Platform/aix.py
@@ -72,9 +72,3 @@ def generate(env) -> None:
     env['MAXLINELENGTH']  = 21576
     env['SHLIBSUFFIX'] = '.a'
     env['HOST_OS'] = 'aix'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/cygwin.py b/SCons/Platform/cygwin.py
index 2353763d7c..9cd399e4fa 100644
--- a/SCons/Platform/cygwin.py
+++ b/SCons/Platform/cygwin.py
@@ -54,9 +54,3 @@ def generate(env) -> None:
     env['TEMPFILEPREFIX'] = '@'
     env['MAXLINELENGTH']  = 2048
     env['HOST_OS'] = 'cygwin'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/darwin.py b/SCons/Platform/darwin.py
index 4ab7466c60..220e740e4c 100644
--- a/SCons/Platform/darwin.py
+++ b/SCons/Platform/darwin.py
@@ -39,7 +39,7 @@ def generate(env) -> None:
     # put macports paths at front to override Apple's versions, fink path is after
     # For now let people who want Macports or Fink tools specify it!
     # env['ENV']['PATH'] = '/opt/local/bin:/opt/local/sbin:' + env['ENV']['PATH'] + ':/sw/bin'
-    
+
     # Store extra system paths in env['ENV']['PATHOSX']
 
     filelist = ['/etc/paths',]
@@ -63,9 +63,3 @@ def generate(env) -> None:
     # Not sure why this wasn't the case all along?
     if env['ENV'].get('PATHOSX', False) and os.environ.get('SCONS_USE_MAC_PATHS', False):
         env.AppendENVPath('PATH',env['ENV']['PATHOSX'])
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/hpux.py b/SCons/Platform/hpux.py
index 9d796db397..8b2b3e4940 100644
--- a/SCons/Platform/hpux.py
+++ b/SCons/Platform/hpux.py
@@ -37,9 +37,3 @@ def generate(env) -> None:
 
     env['SHLIBSUFFIX'] = '.sl'
     env['HOST_OS'] = 'hpux'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/irix.py b/SCons/Platform/irix.py
index 19f619b133..683e42c872 100644
--- a/SCons/Platform/irix.py
+++ b/SCons/Platform/irix.py
@@ -33,9 +33,3 @@
 def generate(env) -> None:
     posix.generate(env)
     env['HOST_OS'] = 'irix'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/os2.py b/SCons/Platform/os2.py
index 72bb034024..09b503b5ae 100644
--- a/SCons/Platform/os2.py
+++ b/SCons/Platform/os2.py
@@ -48,9 +48,3 @@ def generate(env) -> None:
     env['LIBLITERAPPREFIX'] = ''
     env['HOST_OS']        = 'os2'
     env['HOST_ARCH']      = win32.get_architecture().arch
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py
index b655b77d51..a9688090e8 100644
--- a/SCons/Platform/posix.py
+++ b/SCons/Platform/posix.py
@@ -117,9 +117,3 @@ def generate(env) -> None:
 
     if enable_virtualenv and not ignore_virtualenv:
         ImportVirtualenv(env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/sunos.py b/SCons/Platform/sunos.py
index 4aa1fffcb8..b0e8c098d1 100644
--- a/SCons/Platform/sunos.py
+++ b/SCons/Platform/sunos.py
@@ -39,9 +39,3 @@ def generate(env) -> None:
     env['PKGCHK'] = '/usr/sbin/pkgchk'
     env['ENV']['PATH'] = env['ENV']['PATH'] + ':/opt/SUNWspro/bin:/usr/ccs/bin'
     env['HOST_OS'] = 'sunos'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/virtualenv.py b/SCons/Platform/virtualenv.py
index ce62e317a6..4a88421bda 100644
--- a/SCons/Platform/virtualenv.py
+++ b/SCons/Platform/virtualenv.py
@@ -126,10 +126,3 @@ def IsInVirtualenv(path: str) -> bool:
     Returns ``False`` if not using a virtualenv.
     """
     return _is_path_in(path, Virtualenv())
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/virtualenvTests.py b/SCons/Platform/virtualenvTests.py
index cc8565db6e..8aa775b210 100644
--- a/SCons/Platform/virtualenvTests.py
+++ b/SCons/Platform/virtualenvTests.py
@@ -301,10 +301,3 @@ def _msg(expected, given) -> str:
 
 if __name__ == "__main__":
     unittest.main()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Platform/win32.py b/SCons/Platform/win32.py
index 83ab0a0d5e..224541cff9 100644
--- a/SCons/Platform/win32.py
+++ b/SCons/Platform/win32.py
@@ -438,10 +438,3 @@ def generate(env):
 
     if enable_virtualenv and not ignore_virtualenv:
         ImportVirtualenv(env)
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/SConf.py b/SCons/SConf.py
index 7d7874bdd7..762e2b0749 100644
--- a/SCons/SConf.py
+++ b/SCons/SConf.py
@@ -1166,9 +1166,3 @@ def CheckProg(context, prog_name):
     res = SCons.Conftest.CheckProg(context, prog_name)
     context.did_show_result = 1
     return res
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/SConfTests.py b/SCons/SConfTests.py
index 4a3c8b25dd..bee6ad9f14 100644
--- a/SCons/SConfTests.py
+++ b/SCons/SConfTests.py
@@ -883,9 +883,3 @@ def CheckCustom(test):
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/SConsign.py b/SCons/SConsign.py
index 1215c6a504..6b7052d646 100644
--- a/SCons/SConsign.py
+++ b/SCons/SConsign.py
@@ -434,9 +434,3 @@ def File(name, dbm_module=None) -> None:
         DB_Name = name
         if dbm_module is not None:
             DB_Module = dbm_module
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/SConsignTests.py b/SCons/SConsignTests.py
index 84bc2000ba..192388ea52 100644
--- a/SCons/SConsignTests.py
+++ b/SCons/SConsignTests.py
@@ -382,9 +382,3 @@ def sync(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/C.py b/SCons/Scanner/C.py
index bfd897dcb1..2efc678957 100644
--- a/SCons/Scanner/C.py
+++ b/SCons/Scanner/C.py
@@ -324,10 +324,3 @@ def CConditionalScanner():
     (#ifdef, #if, defined, #else, #elif, etc.).
     """
     return SConsCPPConditionalScannerWrapper("CConditionalScanner", "CPPPATH")
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/CTests.py b/SCons/Scanner/CTests.py
index b0fdb566e2..9db665bfd2 100644
--- a/SCons/Scanner/CTests.py
+++ b/SCons/Scanner/CTests.py
@@ -587,9 +587,3 @@ def runTest(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/D.py b/SCons/Scanner/D.py
index fbb28943b9..dc3794c9b3 100644
--- a/SCons/Scanner/D.py
+++ b/SCons/Scanner/D.py
@@ -62,9 +62,3 @@ def find_include_names(self, node):
                 kkk = jjj.split('=')[-1]
                 includes.append(kkk.strip())
         return includes
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/DTests.py b/SCons/Scanner/DTests.py
index 358014d3e1..08f2fd2b0d 100644
--- a/SCons/Scanner/DTests.py
+++ b/SCons/Scanner/DTests.py
@@ -237,7 +237,7 @@ def test_StaticImport(self) -> None:
 
     def test_publicImport(self) -> None:
         self.helper('public.d', ['A.d'])
-    
+
     def test_RenameImport(self) -> None:
         self.helper('rename.d', ['A.d'])
 
@@ -264,9 +264,3 @@ def test_MultilineImport(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/Dir.py b/SCons/Scanner/Dir.py
index 6e0002a0f2..aa271afcaf 100644
--- a/SCons/Scanner/Dir.py
+++ b/SCons/Scanner/Dir.py
@@ -123,9 +123,3 @@ def scan_in_memory(node, env, path=()):
         return []
     entry_list = sorted(filter(do_not_scan, list(entries.keys())))
     return [entries[n] for n in entry_list]
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/DirTests.py b/SCons/Scanner/DirTests.py
index 32355f352c..37ed6ca3f6 100644
--- a/SCons/Scanner/DirTests.py
+++ b/SCons/Scanner/DirTests.py
@@ -122,9 +122,3 @@ def runTest(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/Fortran.py b/SCons/Scanner/Fortran.py
index 14df5fc966..ae3d81ce88 100644
--- a/SCons/Scanner/Fortran.py
+++ b/SCons/Scanner/Fortran.py
@@ -312,9 +312,3 @@ def FortranScan(path_variable: str="FORTRANPATH"):
                          include_regex,
                          def_regex)
     return scanner
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/FortranTests.py b/SCons/Scanner/FortranTests.py
index d2f6089065..767bf04d9a 100644
--- a/SCons/Scanner/FortranTests.py
+++ b/SCons/Scanner/FortranTests.py
@@ -530,9 +530,3 @@ def runTest(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/IDL.py b/SCons/Scanner/IDL.py
index 419ebf6bfa..90a57e88fd 100644
--- a/SCons/Scanner/IDL.py
+++ b/SCons/Scanner/IDL.py
@@ -34,9 +34,3 @@ def IDLScan():
         r'^[ \t]*(?:#[ \t]*include|[ \t]*import)[ \t]+(<|")([^>"]+)(>|")',
     )
     return cs
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/IDLTests.py b/SCons/Scanner/IDLTests.py
index b70115bdc8..00d31b888a 100644
--- a/SCons/Scanner/IDLTests.py
+++ b/SCons/Scanner/IDLTests.py
@@ -190,7 +190,7 @@ class DummyEnvironment:
     def __init__(self, listCppPath) -> None:
         self.path = listCppPath
         self.fs = SCons.Node.FS.FS(test.workpath(''))
-        
+
     def Dictionary(self, *args):
         if not args:
             return { 'CPPPATH': self.path }
@@ -279,7 +279,7 @@ def runTest(self) -> None:
         deps = s(env.File('t2.idl'), env, path)
         headers =  ['d1/f1.idl', 'f1.idl', 'd1/d2/f1.idl', 'f3.idl']
         deps_match(self, deps, headers)
-        
+
 class IDLScannerTestCase5(unittest.TestCase):
     def runTest(self) -> None:
         env = DummyEnvironment([])
@@ -299,7 +299,7 @@ def my_rexists(s):
         # Make sure rexists() got called on the file node being
         # scanned, essential for cooperation with VariantDir functionality.
         assert n.GetTag('rexists_called')
-        
+
         headers =  ['d1/f1.idl', 'd1/f2.idl',
                     'f1.idl', 'f2.idl', 'f3-test.idl',
                     'd1/f1.idl', 'd1/f2.idl', 'd1/f3-test.idl']
@@ -353,7 +353,7 @@ def __call__(self, x) -> None:
 
         # Did we catch the warning associated with not finding fb.idl?
         assert to.out
-        
+
         deps_match(self, deps, [ 'fa.idl' ])
         test.unlink('fa.idl')
 
@@ -423,7 +423,7 @@ def subst(self, arg, target=None, source=None, conv=None, test=test):
         deps = s(env.File('t1.idl'), env, path)
         headers = ['f1.idl', 'f3.idl', 'd1/f2.idl']
         deps_match(self, deps, headers)
-        
+
 
 def suite():
     suite = unittest.TestSuite()
@@ -443,9 +443,3 @@ def suite():
 
 if __name__ == "__main__":
     TestUnit.run(suite())
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/Java.py b/SCons/Scanner/Java.py
index 4a66c9de9e..034265f717 100644
--- a/SCons/Scanner/Java.py
+++ b/SCons/Scanner/Java.py
@@ -103,9 +103,3 @@ def JavaScanner():
     .. versionadded:: 4.4
     """
     return SCons.Scanner.Base(scan, 'JavaScanner', skeys=['.java'])
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/JavaTests.py b/SCons/Scanner/JavaTests.py
index 0a3c7592df..c266dc2290 100644
--- a/SCons/Scanner/JavaTests.py
+++ b/SCons/Scanner/JavaTests.py
@@ -245,9 +245,3 @@ def runTest(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/LaTeX.py b/SCons/Scanner/LaTeX.py
index 77331606c1..3e3b87bcfd 100644
--- a/SCons/Scanner/LaTeX.py
+++ b/SCons/Scanner/LaTeX.py
@@ -436,9 +436,3 @@ def scan_recurse(self, node, path=()):
         # Don't sort on a tuple where the second element is an object, just
         # use the first element of the tuple which is the "sort_key" value
         return [pair[1] for pair in sorted(nodes, key=lambda n: n[0])]
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/LaTeXTests.py b/SCons/Scanner/LaTeXTests.py
index 2cf47dc3a2..ee9e429fc6 100644
--- a/SCons/Scanner/LaTeXTests.py
+++ b/SCons/Scanner/LaTeXTests.py
@@ -211,7 +211,7 @@ def runTest(self) -> None:
          # on windows the paths used to sort are all caps and use backslash
          # due to this only on windows subdir2 < subdir\, so this is the expected order
          files_win = ['inc1.tex', 'inc2.tex', 'subdir2/inc3.tex', 'subdir/inc3.tex']
-         
+
          if sys.platform == 'win32':
              deps_match(self, deps, files_win)
          else:
@@ -219,9 +219,3 @@ def runTest(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/Prog.py b/SCons/Scanner/Prog.py
index 888e121ac1..688b632a92 100644
--- a/SCons/Scanner/Prog.py
+++ b/SCons/Scanner/Prog.py
@@ -106,9 +106,3 @@ def scan(node, env, libpath = ()):
             result.append(lib)
 
     return result
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/ProgTests.py b/SCons/Scanner/ProgTests.py
index 37eb48a8ef..467e11262b 100644
--- a/SCons/Scanner/ProgTests.py
+++ b/SCons/Scanner/ProgTests.py
@@ -256,9 +256,3 @@ def suite():
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/Python.py b/SCons/Scanner/Python.py
index e20d782348..2689394f99 100644
--- a/SCons/Scanner/Python.py
+++ b/SCons/Scanner/Python.py
@@ -208,9 +208,3 @@ def scan(node, env, path=()):
     path_function=path_function,
     recursive=True,
 )
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/PythonTests.py b/SCons/Scanner/PythonTests.py
index 03e4e1031d..bc0f8bb22b 100644
--- a/SCons/Scanner/PythonTests.py
+++ b/SCons/Scanner/PythonTests.py
@@ -323,9 +323,3 @@ def runTest(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/RC.py b/SCons/Scanner/RC.py
index 23afe9dbf8..5d519683d2 100644
--- a/SCons/Scanner/RC.py
+++ b/SCons/Scanner/RC.py
@@ -49,9 +49,3 @@ def RCScan():
     )
 
     return resScanner
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/RCTests.py b/SCons/Scanner/RCTests.py
index 120c7f84be..966d073d09 100644
--- a/SCons/Scanner/RCTests.py
+++ b/SCons/Scanner/RCTests.py
@@ -75,7 +75,7 @@ def __init__(self, **kwargs) -> None:
         super().__init__()
         self.data.update(kwargs)
         self.fs = SCons.Node.FS.FS(test.workpath(''))
-        
+
     def Dictionary(self, *args):
         return self.data
 
@@ -153,13 +153,7 @@ def runTest(self) -> None:
         deps = s(env.File('t3.rc'), env, path)
         headers = ['t1.h']
         deps_match(self, deps, headers)
-        
+
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/SWIG.py b/SCons/Scanner/SWIG.py
index 70a174c5fa..cdd8e8b6d9 100644
--- a/SCons/Scanner/SWIG.py
+++ b/SCons/Scanner/SWIG.py
@@ -31,9 +31,3 @@ def SWIGScanner():
     expr = r'^[ \t]*%[ \t]*(?:include|import|extern)[ \t]*(<|"?)([^>\s"]+)(?:>|"?)'
     scanner = ClassicCPP("SWIGScanner", ".i", "SWIGPATH", expr)
     return scanner
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/ScannerTests.py b/SCons/Scanner/ScannerTests.py
index a777ba5b3b..d0d1289c1e 100644
--- a/SCons/Scanner/ScannerTests.py
+++ b/SCons/Scanner/ScannerTests.py
@@ -630,9 +630,3 @@ def suite():
 
 if __name__ == "__main__":
     TestUnit.run(suite())
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Scanner/__init__.py b/SCons/Scanner/__init__.py
index 61ba8a918b..99b690d719 100644
--- a/SCons/Scanner/__init__.py
+++ b/SCons/Scanner/__init__.py
@@ -430,9 +430,3 @@ def find_include(include, source_dir, path):
     @staticmethod
     def sort_key(include):
         return SCons.Node.FS._my_normcase(' '.join(include))
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Script/Interactive.py b/SCons/Script/Interactive.py
index ec58c0f79d..65e0dd61b5 100644
--- a/SCons/Script/Interactive.py
+++ b/SCons/Script/Interactive.py
@@ -369,9 +369,3 @@ def interact(fs, parser, options, targets, target_top) -> None:
                             targets = targets,
                             target_top = target_top)
     c.cmdloop()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Script/Main.py b/SCons/Script/Main.py
index 27b4f9fc40..6f6b6e53a2 100644
--- a/SCons/Script/Main.py
+++ b/SCons/Script/Main.py
@@ -1587,9 +1587,3 @@ def main() -> None:
         write_scons_stats_file()
 
     sys.exit(exit_status)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Script/MainTests.py b/SCons/Script/MainTests.py
index f7e3263f21..5af85c29d9 100644
--- a/SCons/Script/MainTests.py
+++ b/SCons/Script/MainTests.py
@@ -9,7 +9,7 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
- 
+
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
@@ -35,9 +35,3 @@
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Script/SConsOptions.py b/SCons/Script/SConsOptions.py
index 2690a086c9..c8eaae4939 100644
--- a/SCons/Script/SConsOptions.py
+++ b/SCons/Script/SConsOptions.py
@@ -1252,9 +1252,3 @@ def opt_not_yet(option, opt, value, parser) -> None:
                   # help="Warn when an undefined variable is referenced"
                   help=SUPPRESS_HELP)
     return op
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Script/SConscript.py b/SCons/Script/SConscript.py
index f98cf3b21a..5acc648600 100644
--- a/SCons/Script/SConscript.py
+++ b/SCons/Script/SConscript.py
@@ -705,9 +705,3 @@ def not_a_module(m, d=d, mtype=type(SCons.Script)) -> bool:
              GlobalDict[m] = d[m]
 
     return GlobalDict.copy()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Script/SConscriptTests.py b/SCons/Script/SConscriptTests.py
index e6a8be5552..e3fa76b48e 100644
--- a/SCons/Script/SConscriptTests.py
+++ b/SCons/Script/SConscriptTests.py
@@ -9,7 +9,7 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
- 
+
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
@@ -21,10 +21,4 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# all of the SConscript.py tests are in test/SConscript.py 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
+# all of the SConscript.py tests are in test/SConscript.py
diff --git a/SCons/Script/ScriptTests.py b/SCons/Script/ScriptTests.py
index 334279115d..024c27f88f 100644
--- a/SCons/Script/ScriptTests.py
+++ b/SCons/Script/ScriptTests.py
@@ -173,9 +173,3 @@ def test_Remove_Target_empty(self):
 
 if __name__ == '__main__':
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Script/__init__.py b/SCons/Script/__init__.py
index e4164bf291..d8ae70d3e9 100644
--- a/SCons/Script/__init__.py
+++ b/SCons/Script/__init__.py
@@ -489,9 +489,3 @@ def Variables(files=None, args=ARGUMENTS):
 # unlikely enough that we're going to leave this as is and cross that
 # bridge if someone actually comes to it.
 Command = _SConscript.DefaultEnvironmentCall('Command', subst=1)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Subst.py b/SCons/Subst.py
index e144dbb874..2301e39632 100644
--- a/SCons/Subst.py
+++ b/SCons/Subst.py
@@ -995,9 +995,3 @@ def sub_match(match, val=val, matchlist=matchlist):
         return _dollar_exps.sub(sub_match, strSubst)
     else:
         return strSubst
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/SubstTests.py b/SCons/SubstTests.py
index 3f5395e6fe..5482c1b0a8 100644
--- a/SCons/SubstTests.py
+++ b/SCons/SubstTests.py
@@ -1316,9 +1316,3 @@ def rfile(self):
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Taskmaster/Job.py b/SCons/Taskmaster/Job.py
index fae985e16f..a24742ed65 100644
--- a/SCons/Taskmaster/Job.py
+++ b/SCons/Taskmaster/Job.py
@@ -754,9 +754,3 @@ def _work(self):
             # depending on whether `task` is set. Do not perturb
             # the value of the `task` variable if you add new code
             # after this comment.
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Taskmaster/JobTests.py b/SCons/Taskmaster/JobTests.py
index ce2b3dbb0e..59cfe78adc 100644
--- a/SCons/Taskmaster/JobTests.py
+++ b/SCons/Taskmaster/JobTests.py
@@ -548,11 +548,3 @@ def runTest(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Taskmaster/TaskmasterTests.py b/SCons/Taskmaster/TaskmasterTests.py
index 9e52557c28..ac9d414c32 100644
--- a/SCons/Taskmaster/TaskmasterTests.py
+++ b/SCons/Taskmaster/TaskmasterTests.py
@@ -1318,9 +1318,3 @@ def test_trace(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Taskmaster/__init__.py b/SCons/Taskmaster/__init__.py
index 4d768ee90b..6a5d0bbdc5 100644
--- a/SCons/Taskmaster/__init__.py
+++ b/SCons/Taskmaster/__init__.py
@@ -1126,9 +1126,3 @@ def cleanup(self):
                     (node, repr(node), StateString[node.get_state()])
 
         raise SCons.Errors.UserError(desc)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/386asm.py b/SCons/Tool/386asm.py
index f19f75810b..2258e71e32 100644
--- a/SCons/Tool/386asm.py
+++ b/SCons/Tool/386asm.py
@@ -53,9 +53,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('386asm')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/DCommon.py b/SCons/Tool/DCommon.py
index 35f8f3d6e9..9d27ffd2f2 100644
--- a/SCons/Tool/DCommon.py
+++ b/SCons/Tool/DCommon.py
@@ -78,9 +78,3 @@ def DSharedObjectEmitter(target,source,env):
     for tgt in target:
         tgt.attributes.shared = 1
     return DObjectEmitter(target,source,env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/FortranCommon.py b/SCons/Tool/FortranCommon.py
index dc9dcddf6e..0366b8f780 100644
--- a/SCons/Tool/FortranCommon.py
+++ b/SCons/Tool/FortranCommon.py
@@ -245,9 +245,3 @@ def add_all_to_env(env) -> None:
     add_f95_to_env(env)
     add_f03_to_env(env)
     add_f08_to_env(env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/JavaCommon.py b/SCons/Tool/JavaCommon.py
index 0bcb0eaa5e..75af316fa5 100644
--- a/SCons/Tool/JavaCommon.py
+++ b/SCons/Tool/JavaCommon.py
@@ -587,9 +587,3 @@ def get_java_include_paths(env, javac, version) -> list[str]:
             paths.extend([p, os.path.join(p, 'linux')])
 
     return paths
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/JavaCommonTests.py b/SCons/Tool/JavaCommonTests.py
index bb5c57f036..3c33754351 100644
--- a/SCons/Tool/JavaCommonTests.py
+++ b/SCons/Tool/JavaCommonTests.py
@@ -776,9 +776,3 @@ def test_jdk_globs(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/MSCommon/__init__.py b/SCons/Tool/MSCommon/__init__.py
index 63f9ae4de6..a28d6b3272 100644
--- a/SCons/Tool/MSCommon/__init__.py
+++ b/SCons/Tool/MSCommon/__init__.py
@@ -93,9 +93,3 @@
     msvc_extended_version_components,
     msvc_sdk_version_components,
 )
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/MSCommon/arch.py b/SCons/Tool/MSCommon/arch.py
index e526873694..40a83876e0 100644
--- a/SCons/Tool/MSCommon/arch.py
+++ b/SCons/Tool/MSCommon/arch.py
@@ -58,9 +58,3 @@ def __init__(self, arch, synonyms=[]) -> None:
     SupportedArchitectureMap[a.arch] = a
     for s in a.synonyms:
         SupportedArchitectureMap[s] = a
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/MSCommon/common.py b/SCons/Tool/MSCommon/common.py
index 3fb8b0f9a9..802c71cefe 100644
--- a/SCons/Tool/MSCommon/common.py
+++ b/SCons/Tool/MSCommon/common.py
@@ -623,10 +623,3 @@ def get_pch_node(env, target, source):
         pch_subst = target[0].dir.File(pch_subst)
 
     return pch_subst
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/MSCommon/netframework.py b/SCons/Tool/MSCommon/netframework.py
index 98d9231797..b5b427d627 100644
--- a/SCons/Tool/MSCommon/netframework.py
+++ b/SCons/Tool/MSCommon/netframework.py
@@ -74,9 +74,3 @@ def versrt(a,b):
         versions = []
 
     return versions
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/MSCommon/sdk.py b/SCons/Tool/MSCommon/sdk.py
index a06dfacfc6..b7e4ab6019 100644
--- a/SCons/Tool/MSCommon/sdk.py
+++ b/SCons/Tool/MSCommon/sdk.py
@@ -404,9 +404,3 @@ def mssdk_exists(version=None):
     if version is None:
         return len(sdks) > 0
     return version in sdks
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/MSCommon/vs.py b/SCons/Tool/MSCommon/vs.py
index 47e0d5d8dc..baa5614ed8 100644
--- a/SCons/Tool/MSCommon/vs.py
+++ b/SCons/Tool/MSCommon/vs.py
@@ -639,9 +639,3 @@ def query_versions(env=None):
     considered when a batfile is found."""
     versions = _get_installed_vss(env)
     return versions
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/PharLapCommon.py b/SCons/Tool/PharLapCommon.py
index 034d9d807f..22c1fb1b52 100644
--- a/SCons/Tool/PharLapCommon.py
+++ b/SCons/Tool/PharLapCommon.py
@@ -58,7 +58,7 @@ def getPharLapPath():
         idx=val.find('\0')
         if idx >= 0:
             val = val[:idx]
-                    
+
         return os.path.normpath(val)
     except SCons.Util.RegError:
         raise SCons.Errors.UserError("Cannot find Phar Lap ETS path in the registry.  Is it installed properly?")
@@ -104,13 +104,6 @@ def addPharLapPaths(env) -> None:
                                   os.path.join(ph_path, 'lib'))
     SCons.Util.AddPathIfNotExists(env_dict, 'LIB',
                                   os.path.join(ph_path, os.path.normpath('lib/vclib')))
-    
+
     env['PHARLAP_PATH'] = getPharLapPath()
     env['PHARLAP_VERSION'] = str(getPharLapVersion())
-    
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ToolTests.py b/SCons/Tool/ToolTests.py
index 9621b70bb9..af6898b8c1 100644
--- a/SCons/Tool/ToolTests.py
+++ b/SCons/Tool/ToolTests.py
@@ -124,9 +124,3 @@ def test_pathfind(self) -> None:
     loader.testMethodPrefix = 'test_'
     suite = loader.loadTestsFromTestCase(ToolTestCase)
     TestUnit.run(suite)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/__init__.py b/SCons/Tool/__init__.py
index 75a69ec2ca..b240551b53 100644
--- a/SCons/Tool/__init__.py
+++ b/SCons/Tool/__init__.py
@@ -866,9 +866,3 @@ def find_program_path(env, key_program, default_paths=None, add_path: bool=False
         env.AppendENVPath('PATH', os.path.dirname(path))
 
     return path
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/aixc++.py b/SCons/Tool/aixc++.py
index c3efaea44f..49ec3f2f32 100644
--- a/SCons/Tool/aixc++.py
+++ b/SCons/Tool/aixc++.py
@@ -35,9 +35,3 @@
 
 #forward proxy to the preffered cxx version
 from SCons.Tool.aixcxx import *
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/aixcc.py b/SCons/Tool/aixcc.py
index ccde0a8fcd..99c9270229 100644
--- a/SCons/Tool/aixcc.py
+++ b/SCons/Tool/aixcc.py
@@ -66,9 +66,3 @@ def exists(env):
         if os.path.exists(xlc):
             return xlc
     return None
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/aixcxx.py b/SCons/Tool/aixcxx.py
index 7b478997bb..d51fb6e817 100644
--- a/SCons/Tool/aixcxx.py
+++ b/SCons/Tool/aixcxx.py
@@ -61,7 +61,7 @@ def generate(env) -> None:
 
     if version:
         env['CXXVERSION'] = version
-    
+
 def exists(env):
     path, _cxx, version = get_xlc(env)
     if path and _cxx:
@@ -69,9 +69,3 @@ def exists(env):
         if os.path.exists(xlc):
             return xlc
     return None
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/aixf77.py b/SCons/Tool/aixf77.py
index 33511ee9ca..81f62de60b 100644
--- a/SCons/Tool/aixf77.py
+++ b/SCons/Tool/aixf77.py
@@ -72,9 +72,3 @@ def exists(env):
         if os.path.exists(xlf77):
             return xlf77
     return None
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/aixlink.py b/SCons/Tool/aixlink.py
index 03fc3b0111..ae6b42b5a9 100644
--- a/SCons/Tool/aixlink.py
+++ b/SCons/Tool/aixlink.py
@@ -70,9 +70,3 @@ def exists(env):
             return SCons.Tool.FindTool(linktools, env)
         alltools.extend(linktools)
     return SCons.Tool.FindTool(alltools, env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/applelink.py b/SCons/Tool/applelink.py
index 3dc744d465..8f097d5c65 100644
--- a/SCons/Tool/applelink.py
+++ b/SCons/Tool/applelink.py
@@ -201,9 +201,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env['PLATFORM'] == 'darwin'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ar.py b/SCons/Tool/ar.py
index e3709273b6..a10324dd43 100644
--- a/SCons/Tool/ar.py
+++ b/SCons/Tool/ar.py
@@ -55,9 +55,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('ar')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/as.py b/SCons/Tool/as.py
index d21cc8eea6..7885b0f45f 100644
--- a/SCons/Tool/as.py
+++ b/SCons/Tool/as.py
@@ -40,10 +40,3 @@
 # Resolve FLAKE8 F401 (make sider happy)
 generate = SCons.Tool.asm.generate
 exists = SCons.Tool.asm.exists
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/asm.py b/SCons/Tool/asm.py
index 2c9a915c99..13cfdd4bf3 100644
--- a/SCons/Tool/asm.py
+++ b/SCons/Tool/asm.py
@@ -70,9 +70,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(assemblers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/bcc32.py b/SCons/Tool/bcc32.py
index 5bd14f65ff..fd14ed921b 100644
--- a/SCons/Tool/bcc32.py
+++ b/SCons/Tool/bcc32.py
@@ -73,9 +73,3 @@ def generate(env) -> None:
 
 def exists(env):
     return findIt('bcc32', env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/c++.py b/SCons/Tool/c++.py
index 6b772fa70b..470cbc86db 100644
--- a/SCons/Tool/c++.py
+++ b/SCons/Tool/c++.py
@@ -35,10 +35,3 @@
 
 #forward proxy to the preffered cxx version
 from SCons.Tool.cxx import *
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/cc.py b/SCons/Tool/cc.py
index e9cbe530bc..1ee3f75b03 100644
--- a/SCons/Tool/cc.py
+++ b/SCons/Tool/cc.py
@@ -97,9 +97,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(env.get('CC', compilers))
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/clang.py b/SCons/Tool/clang.py
index 3b9488f9e1..5966796e1a 100644
--- a/SCons/Tool/clang.py
+++ b/SCons/Tool/clang.py
@@ -83,9 +83,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/clangxx.py b/SCons/Tool/clangxx.py
index 9659fe4df4..e51161f04c 100644
--- a/SCons/Tool/clangxx.py
+++ b/SCons/Tool/clangxx.py
@@ -91,9 +91,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/cvf.py b/SCons/Tool/cvf.py
index 0dc74ade3a..460e644ec8 100644
--- a/SCons/Tool/cvf.py
+++ b/SCons/Tool/cvf.py
@@ -50,9 +50,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/cxx.py b/SCons/Tool/cxx.py
index 2cf3299fb3..ebb9ee9494 100644
--- a/SCons/Tool/cxx.py
+++ b/SCons/Tool/cxx.py
@@ -87,9 +87,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(env.get('CXX', compilers))
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/cyglink.py b/SCons/Tool/cyglink.py
index 6a5ca99cf3..57e39eaab6 100644
--- a/SCons/Tool/cyglink.py
+++ b/SCons/Tool/cyglink.py
@@ -227,9 +227,3 @@ def generate(env) -> None:
 
 def exists(env):
     return gnulink.exists(env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/default.py b/SCons/Tool/default.py
index 3ceefb1d9e..9215ad2ac6 100644
--- a/SCons/Tool/default.py
+++ b/SCons/Tool/default.py
@@ -37,9 +37,3 @@ def generate(env) -> None:
 
 def exists(env) -> bool:
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/dmd.py b/SCons/Tool/dmd.py
index 2ac84d0cf2..3021d7a281 100644
--- a/SCons/Tool/dmd.py
+++ b/SCons/Tool/dmd.py
@@ -170,9 +170,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(['dmd', 'ldmd2', 'gdmd'])
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/dvi.py b/SCons/Tool/dvi.py
index 044f62cce1..6b074b372d 100644
--- a/SCons/Tool/dvi.py
+++ b/SCons/Tool/dvi.py
@@ -52,9 +52,3 @@ def exists(env) -> bool:
     # This only puts a skeleton Builder in place, so if someone
     # references this Tool directly, it's always "available."
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/dvipdf.py b/SCons/Tool/dvipdf.py
index c08bf07f64..b49fce53ee 100644
--- a/SCons/Tool/dvipdf.py
+++ b/SCons/Tool/dvipdf.py
@@ -114,9 +114,3 @@ def generate(env) -> None:
 def exists(env):
     SCons.Tool.tex.generate_darwin(env)
     return env.Detect('dvipdf')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/dvips.py b/SCons/Tool/dvips.py
index 7cf717b8d2..bad1c03a2b 100644
--- a/SCons/Tool/dvips.py
+++ b/SCons/Tool/dvips.py
@@ -75,7 +75,7 @@ def generate(env) -> None:
                                           single_source=True)
 
     env['BUILDERS']['PostScript'] = PSBuilder
-    
+
     env['DVIPS']      = 'dvips'
     env['DVIPSFLAGS'] = SCons.Util.CLVar('')
     # I'm not quite sure I got the directories and filenames right for variant_dir
@@ -87,9 +87,3 @@ def generate(env) -> None:
 def exists(env):
     SCons.Tool.tex.generate_darwin(env)
     return env.Detect('dvips')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/f03.py b/SCons/Tool/f03.py
index 7c2f029a59..1f4e213870 100644
--- a/SCons/Tool/f03.py
+++ b/SCons/Tool/f03.py
@@ -50,9 +50,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/f08.py b/SCons/Tool/f08.py
index 30c2d72bd7..ac33ea0138 100644
--- a/SCons/Tool/f08.py
+++ b/SCons/Tool/f08.py
@@ -50,9 +50,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/f77.py b/SCons/Tool/f77.py
index c065f6cd2b..e7d5069d3e 100644
--- a/SCons/Tool/f77.py
+++ b/SCons/Tool/f77.py
@@ -49,9 +49,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/f90.py b/SCons/Tool/f90.py
index b3dde59b85..65cfccfd00 100644
--- a/SCons/Tool/f90.py
+++ b/SCons/Tool/f90.py
@@ -49,9 +49,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/f95.py b/SCons/Tool/f95.py
index b707a115f3..c27d64aada 100644
--- a/SCons/Tool/f95.py
+++ b/SCons/Tool/f95.py
@@ -50,9 +50,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/filesystem.py b/SCons/Tool/filesystem.py
index d90f240439..9b20abf5c3 100644
--- a/SCons/Tool/filesystem.py
+++ b/SCons/Tool/filesystem.py
@@ -86,9 +86,3 @@ def generate(env) -> None:
 
 def exists(env) -> bool:
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/fortran.py b/SCons/Tool/fortran.py
index 4463085f77..18d8205d6e 100644
--- a/SCons/Tool/fortran.py
+++ b/SCons/Tool/fortran.py
@@ -45,9 +45,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/g++.py b/SCons/Tool/g++.py
index 88d88ca840..6c686e8a61 100644
--- a/SCons/Tool/g++.py
+++ b/SCons/Tool/g++.py
@@ -36,10 +36,3 @@
 
 #forward proxy to the preffered cxx version
 from SCons.Tool.gxx import *
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/g77.py b/SCons/Tool/g77.py
index 8c69d8532c..2d2c7eab2b 100644
--- a/SCons/Tool/g77.py
+++ b/SCons/Tool/g77.py
@@ -63,9 +63,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/gas.py b/SCons/Tool/gas.py
index 04c9a2ed8d..5b54d372a0 100644
--- a/SCons/Tool/gas.py
+++ b/SCons/Tool/gas.py
@@ -48,9 +48,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(assemblers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/gcc.py b/SCons/Tool/gcc.py
index 1ccbefcf9e..cb4c2823fc 100644
--- a/SCons/Tool/gcc.py
+++ b/SCons/Tool/gcc.py
@@ -100,9 +100,3 @@ def detect_version(env, cc):
         version = match.group(0)
 
     return version
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/gdc.py b/SCons/Tool/gdc.py
index 96748b9017..5d47cb627c 100644
--- a/SCons/Tool/gdc.py
+++ b/SCons/Tool/gdc.py
@@ -131,10 +131,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('gdc')
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/gfortran.py b/SCons/Tool/gfortran.py
index f438b91717..4de43035f6 100644
--- a/SCons/Tool/gfortran.py
+++ b/SCons/Tool/gfortran.py
@@ -63,9 +63,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('gfortran')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/gnulink.py b/SCons/Tool/gnulink.py
index c636c11d23..10138b02c6 100644
--- a/SCons/Tool/gnulink.py
+++ b/SCons/Tool/gnulink.py
@@ -65,9 +65,3 @@ def exists(env):
             return SCons.Tool.FindTool(linktools, env)
         alltools.extend(linktools)
     return SCons.Tool.FindTool(alltools, env)  # find CXX or CC
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/gs.py b/SCons/Tool/gs.py
index 8955bfd587..dd866767db 100644
--- a/SCons/Tool/gs.py
+++ b/SCons/Tool/gs.py
@@ -61,10 +61,10 @@ def generate(env) -> None:
     try:
         if GhostscriptAction is None:
             GhostscriptAction = SCons.Action.Action('$GSCOM', '$GSCOMSTR')
-    
+
         from SCons.Tool import pdf
         pdf.generate(env)
-    
+
         bld = env['BUILDERS']['PDF']
         bld.add_action('.ps', GhostscriptAction)
     except ImportError as e:
@@ -72,7 +72,7 @@ def generate(env) -> None:
 
     gsbuilder = SCons.Builder.Builder(action = SCons.Action.Action('$GSCOM', '$GSCOMSTR'))
     env['BUILDERS']['Gs'] = gsbuilder
-    
+
     env['GS']      = gs
     env['GSFLAGS'] = SCons.Util.CLVar('-dNOPAUSE -dBATCH -sDEVICE=pdfwrite')
     env['GSCOM']   = '$GS $GSFLAGS -sOutputFile=$TARGET $SOURCES'
@@ -83,9 +83,3 @@ def exists(env):
         return env.Detect(env['PS2PDF'])
     else:
         return env.Detect(gs) or SCons.Util.WhereIs(gs)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/gxx.py b/SCons/Tool/gxx.py
index e788381b75..6b6c8a11c2 100644
--- a/SCons/Tool/gxx.py
+++ b/SCons/Tool/gxx.py
@@ -72,9 +72,3 @@ def generate(env) -> None:
 def exists(env):
     # is executable, and is a GNU compiler (or accepts '--version' at least)
     return gcc.detect_version(env, env.Detect(env.get('CXX', compilers)))
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/hpc++.py b/SCons/Tool/hpc++.py
index 9631277b45..398f4815a6 100644
--- a/SCons/Tool/hpc++.py
+++ b/SCons/Tool/hpc++.py
@@ -36,10 +36,3 @@
 
 #forward proxy to the preffered cxx version
 from SCons.Tool.hpcxx import *
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/hpcc.py b/SCons/Tool/hpcc.py
index f893686a8d..c5354a2184 100644
--- a/SCons/Tool/hpcc.py
+++ b/SCons/Tool/hpcc.py
@@ -45,9 +45,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('aCC')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/hpcxx.py b/SCons/Tool/hpcxx.py
index 60dce35377..d86ebe250b 100644
--- a/SCons/Tool/hpcxx.py
+++ b/SCons/Tool/hpcxx.py
@@ -77,9 +77,3 @@ def generate(env) -> None:
 
 def exists(env):
     return acc
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/hplink.py b/SCons/Tool/hplink.py
index ab2154a403..2aeb5c06fd 100644
--- a/SCons/Tool/hplink.py
+++ b/SCons/Tool/hplink.py
@@ -57,16 +57,10 @@ def generate(env) -> None:
     an Environment.
     """
     link.generate(env)
-    
+
     env['LINKFLAGS']   = SCons.Util.CLVar('-Wl,+s -Wl,+vnocompatwarnings')
     env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -b')
     env['SHLIBSUFFIX'] = '.sl'
 
 def exists(env):
     return ccLinker
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/icc.py b/SCons/Tool/icc.py
index 63c7fd0ff3..4e9378b5ee 100644
--- a/SCons/Tool/icc.py
+++ b/SCons/Tool/icc.py
@@ -51,9 +51,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('icc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/icl.py b/SCons/Tool/icl.py
index 421a388aa4..9166b1792c 100644
--- a/SCons/Tool/icl.py
+++ b/SCons/Tool/icl.py
@@ -44,9 +44,3 @@ def generate(*args, **kw):
 
 def exists(*args, **kw):
     return SCons.Tool.intelc.exists(*args, **kw)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ifl.py b/SCons/Tool/ifl.py
index dac8179fa0..a9b624a6cf 100644
--- a/SCons/Tool/ifl.py
+++ b/SCons/Tool/ifl.py
@@ -59,9 +59,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('ifl')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ifort.py b/SCons/Tool/ifort.py
index 92109234db..ca21bff334 100644
--- a/SCons/Tool/ifort.py
+++ b/SCons/Tool/ifort.py
@@ -78,9 +78,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('ifort')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ilink.py b/SCons/Tool/ilink.py
index 6be62d3c70..8238a6d1d6 100644
--- a/SCons/Tool/ilink.py
+++ b/SCons/Tool/ilink.py
@@ -36,7 +36,7 @@
 def generate(env) -> None:
     """Add Builders and construction variables for ilink to an Environment."""
     SCons.Tool.createProgBuilder(env)
-    
+
     env['LINK']        = 'ilink'
     env['LINKFLAGS']   = SCons.Util.CLVar('')
     env['LINKCOM']     = '$LINK $LINKFLAGS /O:$TARGET $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
@@ -47,9 +47,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('ilink')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ilink32.py b/SCons/Tool/ilink32.py
index 1bdc6d0a67..d8bbf0b2d7 100644
--- a/SCons/Tool/ilink32.py
+++ b/SCons/Tool/ilink32.py
@@ -52,9 +52,3 @@ def exists(env):
     # Uses bcc32 to do linking as it generally knows where the standard
     # LIBS are and set up the linking correctly
     return SCons.Tool.bcc32.findIt('bcc32', env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/install.py b/SCons/Tool/install.py
index fc20586ff0..38428722a0 100644
--- a/SCons/Tool/install.py
+++ b/SCons/Tool/install.py
@@ -502,9 +502,3 @@ def generate(env) -> None:
 
 def exists(env) -> bool:
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/intelc.py b/SCons/Tool/intelc.py
index 1d697a8d8e..85e4f7e416 100644
--- a/SCons/Tool/intelc.py
+++ b/SCons/Tool/intelc.py
@@ -609,9 +609,3 @@ def exists(env):
     return detected
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ipkg.py b/SCons/Tool/ipkg.py
index b295c121e2..4cf1b7c22e 100644
--- a/SCons/Tool/ipkg.py
+++ b/SCons/Tool/ipkg.py
@@ -6,7 +6,7 @@
 It will usually be imported through the generic SCons.Tool.Tool()
 selection method.
 
-The ipkg tool calls the ipkg-build. Its only argument should be the 
+The ipkg tool calls the ipkg-build. Its only argument should be the
 packages fake_root.
 """
 
@@ -67,9 +67,3 @@ def exists(env):
     Can we find the tool
     """
     return env.Detect('ipkg-build')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/jar.py b/SCons/Tool/jar.py
index 13bdca0518..26e781ce16 100644
--- a/SCons/Tool/jar.py
+++ b/SCons/Tool/jar.py
@@ -249,9 +249,3 @@ def exists(env) -> bool:
     # javac Builder).
     # TODO: Come up with a proper detect() routine...and enable it.
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/javac.py b/SCons/Tool/javac.py
index a805937bc8..4197285fc9 100644
--- a/SCons/Tool/javac.py
+++ b/SCons/Tool/javac.py
@@ -240,9 +240,3 @@ def generate(env) -> None:
 
 def exists(env) -> bool:
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/javah.py b/SCons/Tool/javah.py
index 4b688152e1..b5589f0f8b 100644
--- a/SCons/Tool/javah.py
+++ b/SCons/Tool/javah.py
@@ -140,9 +140,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('javah')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/latex.py b/SCons/Tool/latex.py
index ddbcdf998a..e8584a1541 100644
--- a/SCons/Tool/latex.py
+++ b/SCons/Tool/latex.py
@@ -72,9 +72,3 @@ def generate(env) -> None:
 def exists(env):
     SCons.Tool.tex.generate_darwin(env)
     return env.Detect('latex')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ldc.py b/SCons/Tool/ldc.py
index 6ee022aa34..3c17614504 100644
--- a/SCons/Tool/ldc.py
+++ b/SCons/Tool/ldc.py
@@ -147,10 +147,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('ldc2')
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/lex.py b/SCons/Tool/lex.py
index 5e77ea692d..0da0ea845a 100644
--- a/SCons/Tool/lex.py
+++ b/SCons/Tool/lex.py
@@ -168,9 +168,3 @@ def exists(env) -> str | None:
         return get_lex_path(env)
     else:
         return env.Detect(BINS)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/link.py b/SCons/Tool/link.py
index cd8b2f88b5..74570c3923 100644
--- a/SCons/Tool/link.py
+++ b/SCons/Tool/link.py
@@ -64,9 +64,3 @@ def exists(env):
     # This module isn't really a Tool on its own, it's common logic for
     # other linkers.
     return None
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/linkCommon/linkCommmonTests.py b/SCons/Tool/linkCommon/linkCommmonTests.py
index 5326da214a..ac0651cf7c 100644
--- a/SCons/Tool/linkCommon/linkCommmonTests.py
+++ b/SCons/Tool/linkCommon/linkCommmonTests.py
@@ -67,9 +67,3 @@ def test_shlib_symlink_emitter(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/linkloc.py b/SCons/Tool/linkloc.py
index 6f7a7324ae..c86a5d8bc9 100644
--- a/SCons/Tool/linkloc.py
+++ b/SCons/Tool/linkloc.py
@@ -104,9 +104,3 @@ def exists(env):
         return env.Detect('linkloc')
     else:
         return 0
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/m4.py b/SCons/Tool/m4.py
index 341d93dfae..a33f82de90 100644
--- a/SCons/Tool/m4.py
+++ b/SCons/Tool/m4.py
@@ -55,9 +55,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('m4')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/masm.py b/SCons/Tool/masm.py
index f8fae2019e..253f59d5f2 100644
--- a/SCons/Tool/masm.py
+++ b/SCons/Tool/masm.py
@@ -69,9 +69,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('ml')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/midl.py b/SCons/Tool/midl.py
index 3054fffea7..9aed82e16b 100644
--- a/SCons/Tool/midl.py
+++ b/SCons/Tool/midl.py
@@ -84,9 +84,3 @@ def generate(env) -> None:
 
 def exists(env):
     return msvc_setup_env_tool(env, tool=tool_name)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/mingw.py b/SCons/Tool/mingw.py
index 824f20daaa..da715692fd 100644
--- a/SCons/Tool/mingw.py
+++ b/SCons/Tool/mingw.py
@@ -226,9 +226,3 @@ def exists(env):
         env.AppendENVPath('PATH', mingw_bin_dir)
 
     return mingw
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/msgfmt.py b/SCons/Tool/msgfmt.py
index 334e0580e8..18cf72c331 100644
--- a/SCons/Tool/msgfmt.py
+++ b/SCons/Tool/msgfmt.py
@@ -124,9 +124,3 @@ def exists(env):
         return _msgfmt_exists(env)
     except StopError:
         return False
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/msginit.py b/SCons/Tool/msginit.py
index 19aaccb4ee..7baca4721e 100644
--- a/SCons/Tool/msginit.py
+++ b/SCons/Tool/msginit.py
@@ -129,9 +129,3 @@ def exists(env):
         return _msginit_exists(env)
     except StopError:
         return False
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/msgmerge.py b/SCons/Tool/msgmerge.py
index 292e75d6db..081cf71ee7 100644
--- a/SCons/Tool/msgmerge.py
+++ b/SCons/Tool/msgmerge.py
@@ -117,9 +117,3 @@ def exists(env):
         return _msgmerge_exists(env)
     except StopError:
         return False
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/mslib.py b/SCons/Tool/mslib.py
index bdce135f81..43f3544535 100644
--- a/SCons/Tool/mslib.py
+++ b/SCons/Tool/mslib.py
@@ -70,9 +70,3 @@ def generate(env) -> None:
 
 def exists(env):
     return msvc_setup_env_tool(env, tool=tool_name)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/mslink.py b/SCons/Tool/mslink.py
index 74ceaa8572..11819f3f8f 100644
--- a/SCons/Tool/mslink.py
+++ b/SCons/Tool/mslink.py
@@ -336,9 +336,3 @@ def generate(env) -> None:
 
 def exists(env):
     return msvc_setup_env_tool(env, tool=tool_name)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/mssdk.py b/SCons/Tool/mssdk.py
index ef272c033d..2332942733 100644
--- a/SCons/Tool/mssdk.py
+++ b/SCons/Tool/mssdk.py
@@ -44,9 +44,3 @@ def generate(env) -> None:
 
 def exists(env):
     return mssdk_exists()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/msvc.py b/SCons/Tool/msvc.py
index e73869bc4e..40d292cbfe 100644
--- a/SCons/Tool/msvc.py
+++ b/SCons/Tool/msvc.py
@@ -325,9 +325,3 @@ def generate(env) -> None:
 
 def exists(env):
     return msvc_setup_env_tool(env, tool=tool_name)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/msvs.py b/SCons/Tool/msvs.py
index 6dfc250374..99737568ec 100644
--- a/SCons/Tool/msvs.py
+++ b/SCons/Tool/msvs.py
@@ -2189,9 +2189,3 @@ def generate(env) -> None:
 
 def exists(env):
     return msvc_setup_env_tool(env, tool=tool_name)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/msvsTests.py b/SCons/Tool/msvsTests.py
index 550352f3ce..81620473e4 100644
--- a/SCons/Tool/msvsTests.py
+++ b/SCons/Tool/msvsTests.py
@@ -998,9 +998,3 @@ class msvsEmptyTestCase(msvsTestCase):
             os.env = back_osenv
 
     sys.exit(exit_val)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/mwcc.py b/SCons/Tool/mwcc.py
index 22b610a9f1..f6c89d2908 100644
--- a/SCons/Tool/mwcc.py
+++ b/SCons/Tool/mwcc.py
@@ -199,9 +199,3 @@ def generate(env) -> None:
 
 def exists(env):
     return set_vars(env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/mwld.py b/SCons/Tool/mwld.py
index 9824c01b5d..6eb676df02 100644
--- a/SCons/Tool/mwld.py
+++ b/SCons/Tool/mwld.py
@@ -100,9 +100,3 @@ def shlib_emitter(target, source, env):
 
 
 shlib_action = SCons.Action.Action(shlib_generator, generator=1)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/nasm.py b/SCons/Tool/nasm.py
index 253ad1cf65..3311da575d 100644
--- a/SCons/Tool/nasm.py
+++ b/SCons/Tool/nasm.py
@@ -64,9 +64,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('nasm')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ninja_tool/UtilsTests.py b/SCons/Tool/ninja_tool/UtilsTests.py
index fe4f57e3ef..354102de5c 100644
--- a/SCons/Tool/ninja_tool/UtilsTests.py
+++ b/SCons/Tool/ninja_tool/UtilsTests.py
@@ -118,9 +118,3 @@ def generator(target, source, env, for_signature):
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ninja_tool/ninja_daemon_build.py b/SCons/Tool/ninja_tool/ninja_daemon_build.py
index 7ef52b6cfa..70d05807b5 100644
--- a/SCons/Tool/ninja_tool/ninja_daemon_build.py
+++ b/SCons/Tool/ninja_tool/ninja_daemon_build.py
@@ -106,11 +106,3 @@ def log_error(msg) -> None:
     except Exception:
         log_error(f"Failed to send command: {traceback.format_exc()}")
         exit(1)
-
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ninja_tool/ninja_run_daemon.py b/SCons/Tool/ninja_tool/ninja_run_daemon.py
index a3a3e7667d..2283925ab1 100644
--- a/SCons/Tool/ninja_tool/ninja_run_daemon.py
+++ b/SCons/Tool/ninja_tool/ninja_run_daemon.py
@@ -120,9 +120,3 @@ def log_error(msg) -> None:
         except Exception:
             log_error(f"Error: {traceback.format_exc()}")
             exit(1)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/ninja_tool/ninja_scons_daemon.py b/SCons/Tool/ninja_tool/ninja_scons_daemon.py
index 625cf0cb9e..cb9e2d5ece 100644
--- a/SCons/Tool/ninja_tool/ninja_scons_daemon.py
+++ b/SCons/Tool/ninja_tool/ninja_scons_daemon.py
@@ -362,9 +362,3 @@ def log_message(self, format, *args) -> None:
     os.unlink(ninja_builddir / "scons_daemon_dirty")
 if os.path.exists(daemon_dir / "pidfile"):
     os.unlink(daemon_dir / "pidfile")
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/__init__.py b/SCons/Tool/packaging/__init__.py
index 0bf08fa6ad..ccbeff4416 100644
--- a/SCons/Tool/packaging/__init__.py
+++ b/SCons/Tool/packaging/__init__.py
@@ -313,9 +313,3 @@ def has_no_install_location(file) -> bool:
                 ss.Tag('PACKAGING_INSTALL_LOCATION', s.get_path())
 
     return target, n_source
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/ipk.py b/SCons/Tool/packaging/ipk.py
index 930eacbec2..d07970715a 100644
--- a/SCons/Tool/packaging/ipk.py
+++ b/SCons/Tool/packaging/ipk.py
@@ -181,9 +181,3 @@ def open_file(needle, haystack=None):
         content += env['CHANGE_SPECFILE'](target)
 
     return 0
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/msi.py b/SCons/Tool/packaging/msi.py
index 6746db8f43..68568db5d5 100644
--- a/SCons/Tool/packaging/msi.py
+++ b/SCons/Tool/packaging/msi.py
@@ -514,9 +514,3 @@ def package(env, target, source, PACKAGEROOT, NAME, VERSION,
 
     # return the target and source tuple.
     return (msifile, source+[specfile])
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/rpm.py b/SCons/Tool/packaging/rpm.py
index a51e8679e6..a45ab2e832 100644
--- a/SCons/Tool/packaging/rpm.py
+++ b/SCons/Tool/packaging/rpm.py
@@ -349,9 +349,3 @@ def strip_country_code(tag):
                     raise e
 
         return str
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/src_tarbz2.py b/SCons/Tool/packaging/src_tarbz2.py
index d132291213..066b41c3eb 100644
--- a/SCons/Tool/packaging/src_tarbz2.py
+++ b/SCons/Tool/packaging/src_tarbz2.py
@@ -5,7 +5,7 @@
 
 #
 # __COPYRIGHT__
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -35,9 +35,3 @@ def package(env, target, source, PACKAGEROOT, **kw):
     bld.set_suffix('.tar.bz2')
     target, source = putintopackageroot(target, source, env, PACKAGEROOT, honor_install_location=0)
     return bld(env, target, source, TARFLAGS='-jc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/src_targz.py b/SCons/Tool/packaging/src_targz.py
index 7b759dc710..b090885933 100644
--- a/SCons/Tool/packaging/src_targz.py
+++ b/SCons/Tool/packaging/src_targz.py
@@ -35,9 +35,3 @@ def package(env, target, source, PACKAGEROOT, **kw):
     bld.set_suffix('.tar.gz')
     target, source = putintopackageroot(target, source, env, PACKAGEROOT, honor_install_location=0)
     return bld(env, target, source, TARFLAGS='-zc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/src_tarxz.py b/SCons/Tool/packaging/src_tarxz.py
index 5889b8a8f1..604ef2c966 100644
--- a/SCons/Tool/packaging/src_tarxz.py
+++ b/SCons/Tool/packaging/src_tarxz.py
@@ -35,9 +35,3 @@ def package(env, target, source, PACKAGEROOT, **kw):
     bld.set_suffix('.tar.xz')
     target, source = putintopackageroot(target, source, env, PACKAGEROOT, honor_install_location=0)
     return bld(env, target, source, TARFLAGS='-Jc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/src_zip.py b/SCons/Tool/packaging/src_zip.py
index 3df73970b3..b7ecfe20f0 100644
--- a/SCons/Tool/packaging/src_zip.py
+++ b/SCons/Tool/packaging/src_zip.py
@@ -5,7 +5,7 @@
 
 #
 # __COPYRIGHT__
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -35,9 +35,3 @@ def package(env, target, source, PACKAGEROOT, **kw):
     bld.set_suffix('.zip')
     target, source = putintopackageroot(target, source, env, PACKAGEROOT, honor_install_location=0)
     return bld(env, target, source)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/tarbz2.py b/SCons/Tool/packaging/tarbz2.py
index 392bf956d0..37a4a1f1e2 100644
--- a/SCons/Tool/packaging/tarbz2.py
+++ b/SCons/Tool/packaging/tarbz2.py
@@ -5,7 +5,7 @@
 
 #
 # __COPYRIGHT__
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -36,9 +36,3 @@ def package(env, target, source, PACKAGEROOT, **kw):
     target, source = putintopackageroot(target, source, env, PACKAGEROOT)
     target, source = stripinstallbuilder(target, source, env)
     return bld(env, target, source, TARFLAGS='-jc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/targz.py b/SCons/Tool/packaging/targz.py
index 4130f32f20..2a76e17942 100644
--- a/SCons/Tool/packaging/targz.py
+++ b/SCons/Tool/packaging/targz.py
@@ -5,7 +5,7 @@
 
 #
 # __COPYRIGHT__
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -36,9 +36,3 @@ def package(env, target, source, PACKAGEROOT, **kw):
     target, source = stripinstallbuilder(target, source, env)
     target, source = putintopackageroot(target, source, env, PACKAGEROOT)
     return bld(env, target, source, TARFLAGS='-zc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/tarxz.py b/SCons/Tool/packaging/tarxz.py
index 747296b383..f52ab6dd44 100644
--- a/SCons/Tool/packaging/tarxz.py
+++ b/SCons/Tool/packaging/tarxz.py
@@ -36,9 +36,3 @@ def package(env, target, source, PACKAGEROOT, **kw):
     target, source = putintopackageroot(target, source, env, PACKAGEROOT)
     target, source = stripinstallbuilder(target, source, env)
     return bld(env, target, source, TARFLAGS='-Jc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/packaging/zip.py b/SCons/Tool/packaging/zip.py
index 1f76f1609d..4d7305c892 100644
--- a/SCons/Tool/packaging/zip.py
+++ b/SCons/Tool/packaging/zip.py
@@ -5,7 +5,7 @@
 
 #
 # __COPYRIGHT__
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -36,9 +36,3 @@ def package(env, target, source, PACKAGEROOT, **kw):
     target, source = stripinstallbuilder(target, source, env)
     target, source = putintopackageroot(target, source, env, PACKAGEROOT)
     return bld(env, target, source)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/pdf.py b/SCons/Tool/pdf.py
index 74b2449409..b38a5f831e 100644
--- a/SCons/Tool/pdf.py
+++ b/SCons/Tool/pdf.py
@@ -67,9 +67,3 @@ def exists(env) -> bool:
     # This only puts a skeleton Builder in place, so if someone
     # references this Tool directly, it's always "available."
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/pdflatex.py b/SCons/Tool/pdflatex.py
index e3c733b970..2066d341ff 100644
--- a/SCons/Tool/pdflatex.py
+++ b/SCons/Tool/pdflatex.py
@@ -76,9 +76,3 @@ def generate(env) -> None:
 def exists(env):
     SCons.Tool.tex.generate_darwin(env)
     return env.Detect('pdflatex')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/pdftex.py b/SCons/Tool/pdftex.py
index 4b7707fbe4..fe579faf39 100644
--- a/SCons/Tool/pdftex.py
+++ b/SCons/Tool/pdftex.py
@@ -92,7 +92,7 @@ def generate(env) -> None:
     bld.add_action('.tex', PDFTeXLaTeXAction)
     bld.add_emitter('.tex', SCons.Tool.tex.tex_pdf_emitter)
 
-    # Add the epstopdf builder after the pdftex builder 
+    # Add the epstopdf builder after the pdftex builder
     # so pdftex is the default for no source suffix
     pdf.generate2(env)
 
@@ -101,9 +101,3 @@ def generate(env) -> None:
 def exists(env):
     SCons.Tool.tex.generate_darwin(env)
     return env.Detect('pdftex')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/python.py b/SCons/Tool/python.py
index 2820afb47f..b9451a445f 100644
--- a/SCons/Tool/python.py
+++ b/SCons/Tool/python.py
@@ -41,9 +41,3 @@ def generate(env) -> None:
 
 def exists(env) -> bool:
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/qt3.py b/SCons/Tool/qt3.py
index d35b661a43..2d7816fb23 100644
--- a/SCons/Tool/qt3.py
+++ b/SCons/Tool/qt3.py
@@ -363,9 +363,3 @@ def generate(env):
 
 def exists(env):
     return _detect_qt3(env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/rmic.py b/SCons/Tool/rmic.py
index a5d8063697..c44d9528fd 100644
--- a/SCons/Tool/rmic.py
+++ b/SCons/Tool/rmic.py
@@ -126,9 +126,3 @@ def exists(env) -> bool:
     # javac Builder).
     # TODO: Come up with a proper detect() routine...and enable it.
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/rpcgen.py b/SCons/Tool/rpcgen.py
index d5f514a44f..aef24460d0 100644
--- a/SCons/Tool/rpcgen.py
+++ b/SCons/Tool/rpcgen.py
@@ -44,7 +44,7 @@
 
 def generate(env) -> None:
     """Add RPCGEN Builders and construction variables for an Environment."""
-    
+
     client  = Builder(action=rpcgen_client,  suffix='_clnt.c', src_suffix='.x')
     header  = Builder(action=rpcgen_header,  suffix='.h',      src_suffix='.x')
     service = Builder(action=rpcgen_service, suffix='_svc.c',  src_suffix='.x')
@@ -62,9 +62,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('rpcgen')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/rpm.py b/SCons/Tool/rpm.py
index 94f5e574a6..3ea33d4660 100644
--- a/SCons/Tool/rpm.py
+++ b/SCons/Tool/rpm.py
@@ -125,9 +125,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('rpmbuild')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sgiar.py b/SCons/Tool/sgiar.py
index 72ce3766b8..d905f9f2a0 100644
--- a/SCons/Tool/sgiar.py
+++ b/SCons/Tool/sgiar.py
@@ -42,7 +42,7 @@
 def generate(env) -> None:
     """Add Builders and construction variables for ar to an Environment."""
     SCons.Tool.createStaticLibBuilder(env)
-    
+
     if env.Detect('CC'):
         env['AR']          = 'CC'
         env['ARFLAGS']     = SCons.Util.CLVar('-ar')
@@ -51,7 +51,7 @@ def generate(env) -> None:
         env['AR']          = 'ar'
         env['ARFLAGS']     = SCons.Util.CLVar('r')
         env['ARCOM']       = '$AR $ARFLAGS $TARGET $SOURCES'
-        
+
     env['SHLINK']      = '$LINK'
     env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
     env['SHLINKCOM']   = '$SHLINK $SHLINKFLAGS -o $TARGET $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
@@ -60,9 +60,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('CC') or env.Detect('ar')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sgic++.py b/SCons/Tool/sgic++.py
index 63c66e26e8..44a28c3959 100644
--- a/SCons/Tool/sgic++.py
+++ b/SCons/Tool/sgic++.py
@@ -35,9 +35,3 @@
 
 #forward proxy to the preffered cxx version
 from SCons.Tool.sgicxx import *
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sgicc.py b/SCons/Tool/sgicc.py
index 7950d10749..f1feab13cf 100644
--- a/SCons/Tool/sgicc.py
+++ b/SCons/Tool/sgicc.py
@@ -45,9 +45,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('cc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sgicxx.py b/SCons/Tool/sgicxx.py
index 796f7ab1d0..649a510876 100644
--- a/SCons/Tool/sgicxx.py
+++ b/SCons/Tool/sgicxx.py
@@ -50,12 +50,6 @@ def generate(env) -> None:
     env['SHCXX']       = '$CXX'
     env['SHOBJSUFFIX'] = '.o'
     env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
-    
+
 def exists(env):
     return env.Detect('CC')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sgilink.py b/SCons/Tool/sgilink.py
index f66ad5ab13..127d8eb3f7 100644
--- a/SCons/Tool/sgilink.py
+++ b/SCons/Tool/sgilink.py
@@ -39,7 +39,7 @@
 def generate(env) -> None:
     """Add Builders and construction variables for MIPSPro to an Environment."""
     link.generate(env)
-    
+
     env['LINK'] = env.Detect(linkers) or 'cc'
     env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
 
@@ -51,9 +51,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(linkers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sunar.py b/SCons/Tool/sunar.py
index 03223b6366..307362f04c 100644
--- a/SCons/Tool/sunar.py
+++ b/SCons/Tool/sunar.py
@@ -41,7 +41,7 @@
 def generate(env) -> None:
     """Add Builders and construction variables for ar to an Environment."""
     SCons.Tool.createStaticLibBuilder(env)
-    
+
     if env.Detect('CC'):
         env['AR']          = 'CC'
         env['ARFLAGS']     = SCons.Util.CLVar('-xar')
@@ -56,9 +56,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('CC') or env.Detect('ar')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sunc++.py b/SCons/Tool/sunc++.py
index 3304f80618..9ac15dda37 100644
--- a/SCons/Tool/sunc++.py
+++ b/SCons/Tool/sunc++.py
@@ -36,10 +36,3 @@
 
 #forward proxy to the preffered cxx version
 from SCons.Tool.suncxx import *
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/suncc.py b/SCons/Tool/suncc.py
index 4ef023158d..f25d7ee16c 100644
--- a/SCons/Tool/suncc.py
+++ b/SCons/Tool/suncc.py
@@ -50,9 +50,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect('CC')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/suncxx.py b/SCons/Tool/suncxx.py
index ac0b0c75f6..e09d7041bf 100644
--- a/SCons/Tool/suncxx.py
+++ b/SCons/Tool/suncxx.py
@@ -52,7 +52,7 @@ def get_package_info(package_name, pkginfo, pkgchk):
     except KeyError:
         version = None
         pathname = None
-        from subprocess import DEVNULL 
+        from subprocess import DEVNULL
 
         try:
             with open('/var/sadm/install/contents', encoding='UTF-8') as f:
@@ -145,9 +145,3 @@ def exists(env):
         if os.path.exists(cppc):
             return cppc
     return None
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sunf77.py b/SCons/Tool/sunf77.py
index efeb488a2d..f39b8d4e99 100644
--- a/SCons/Tool/sunf77.py
+++ b/SCons/Tool/sunf77.py
@@ -55,9 +55,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sunf90.py b/SCons/Tool/sunf90.py
index 4ce03c19ad..63893c1eca 100644
--- a/SCons/Tool/sunf90.py
+++ b/SCons/Tool/sunf90.py
@@ -56,9 +56,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sunf95.py b/SCons/Tool/sunf95.py
index 273987b77b..525230db4e 100644
--- a/SCons/Tool/sunf95.py
+++ b/SCons/Tool/sunf95.py
@@ -56,9 +56,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(compilers)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/sunlink.py b/SCons/Tool/sunlink.py
index a05fdb8d34..5cc2ece88a 100644
--- a/SCons/Tool/sunlink.py
+++ b/SCons/Tool/sunlink.py
@@ -71,9 +71,3 @@ def generate(env) -> None:
 
 def exists(env):
     return ccLinker
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/swig.py b/SCons/Tool/swig.py
index 3072960cc4..1f8d489769 100644
--- a/SCons/Tool/swig.py
+++ b/SCons/Tool/swig.py
@@ -207,9 +207,3 @@ def generate(env) -> None:
 def exists(env):
     swig = env.get('SWIG') or env.Detect(['swig'])
     return swig
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/tar.py b/SCons/Tool/tar.py
index ba7f45cb40..556352f1f8 100644
--- a/SCons/Tool/tar.py
+++ b/SCons/Tool/tar.py
@@ -65,9 +65,3 @@ def generate(env) -> None:
 
 def exists(env):
     return env.Detect(tars)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/tex.py b/SCons/Tool/tex.py
index 6d366334aa..db73edadf6 100644
--- a/SCons/Tool/tex.py
+++ b/SCons/Tool/tex.py
@@ -990,9 +990,3 @@ def generate_common(env) -> None:
 def exists(env):
     generate_darwin(env)
     return env.Detect('tex')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/textfile.py b/SCons/Tool/textfile.py
index 04a5cd7fd1..3a524de916 100644
--- a/SCons/Tool/textfile.py
+++ b/SCons/Tool/textfile.py
@@ -191,9 +191,3 @@ def generate(env) -> None:
 
 def exists(env) -> bool:
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/tlib.py b/SCons/Tool/tlib.py
index 8b0e6ddad8..f200c5abe9 100644
--- a/SCons/Tool/tlib.py
+++ b/SCons/Tool/tlib.py
@@ -45,9 +45,3 @@ def generate(env) -> None:
 
 def exists(env):
     return SCons.Tool.bcc32.findIt('tlib', env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/wix.py b/SCons/Tool/wix.py
index 617abf2738..06d96908ea 100644
--- a/SCons/Tool/wix.py
+++ b/SCons/Tool/wix.py
@@ -66,7 +66,7 @@ def exists(env):
     env['WIXCANDLE'] = 'candle.exe'
     env['WIXLIGHT']  = 'light.exe'
 
-    # try to find the candle.exe and light.exe tools and 
+    # try to find the candle.exe and light.exe tools and
     # add the install directory to light libpath.
     for path in os.environ['PATH'].split(os.pathsep):
         if not path:
@@ -96,9 +96,3 @@ def exists(env):
             pass # ignore this, could be a stale PATH entry.
 
     return None
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/wixTests.py b/SCons/Tool/wixTests.py
index 26b2295b81..e781b19e10 100644
--- a/SCons/Tool/wixTests.py
+++ b/SCons/Tool/wixTests.py
@@ -52,9 +52,3 @@ def test_vars(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/xgettext.py b/SCons/Tool/xgettext.py
index 69408c20f1..8bb94c4745 100644
--- a/SCons/Tool/xgettext.py
+++ b/SCons/Tool/xgettext.py
@@ -328,10 +328,3 @@ def exists(env):
         return _xgettext_exists(env)
     except:
         return False
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/yacc.py b/SCons/Tool/yacc.py
index bfd82f6053..b04009f863 100644
--- a/SCons/Tool/yacc.py
+++ b/SCons/Tool/yacc.py
@@ -209,9 +209,3 @@ def exists(env) -> str | None:
         return get_yacc_path(env)
     else:
         return env.Detect(BINS)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Tool/zip.py b/SCons/Tool/zip.py
index 4c04afceba..1b6e08405d 100644
--- a/SCons/Tool/zip.py
+++ b/SCons/Tool/zip.py
@@ -112,9 +112,3 @@ def generate(env) -> None:
 
 def exists(env) -> bool:
     return True
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Util/UtilTests.py b/SCons/Util/UtilTests.py
index 581d435e89..264cc69a8e 100644
--- a/SCons/Util/UtilTests.py
+++ b/SCons/Util/UtilTests.py
@@ -1311,9 +1311,3 @@ def test_is_valid_construction_var(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Util/__init__.py b/SCons/Util/__init__.py
index ff693c8d7c..71644c2c37 100644
--- a/SCons/Util/__init__.py
+++ b/SCons/Util/__init__.py
@@ -1415,9 +1415,3 @@ def sanitize_shell_env(execution_env: dict) -> dict:
             # produce something reasonable for just about everything else:
             new_env[key] = str(value)
     return new_env
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Util/envs.py b/SCons/Util/envs.py
index d71bbee9b7..23e62ad134 100644
--- a/SCons/Util/envs.py
+++ b/SCons/Util/envs.py
@@ -342,9 +342,3 @@ def AddMethod(obj, function: Callable, name: str | None = None) -> None:
 def is_valid_construction_var(varstr: str) -> bool:
     """Return True if *varstr* is a legitimate name of a construction variable."""
     return bool(_is_valid_var_re.match(varstr))
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Util/filelock.py b/SCons/Util/filelock.py
index 597ad00016..2ff9432659 100644
--- a/SCons/Util/filelock.py
+++ b/SCons/Util/filelock.py
@@ -173,9 +173,3 @@ def __repr__(self) -> str:
             f"pid={os.getpid()}) "
             f"at 0x{id(self):x}>"
         )
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Util/filelockTests.py b/SCons/Util/filelockTests.py
index 8179074a78..16f147b351 100644
--- a/SCons/Util/filelockTests.py
+++ b/SCons/Util/filelockTests.py
@@ -96,9 +96,3 @@ def test_timeout_lockfail(self):
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Util/hashes.py b/SCons/Util/hashes.py
index 8eb6daac2a..4950f6805e 100644
--- a/SCons/Util/hashes.py
+++ b/SCons/Util/hashes.py
@@ -397,10 +397,3 @@ def MD5collect(signatures):
 
     _show_md5_warning("MD5collect")
     return hash_collect(signatures)
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Util/sctypes.py b/SCons/Util/sctypes.py
index a3b447a0b7..12c13cd4b0 100644
--- a/SCons/Util/sctypes.py
+++ b/SCons/Util/sctypes.py
@@ -374,10 +374,3 @@ def get_environment_var(varstr) -> str | None:
         return var
 
     return None
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Util/stats.py b/SCons/Util/stats.py
index ce820e66c6..a4935e3acd 100644
--- a/SCons/Util/stats.py
+++ b/SCons/Util/stats.py
@@ -215,10 +215,3 @@ def write_scons_stats_file():
 
     with open(JSON_OUTPUT_FILE, 'w') as sf:
         sf.write(json.dumps(json_structure, indent=4))
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Utilities/sconsign.py b/SCons/Utilities/sconsign.py
index 4cef4779bd..7216604cb7 100644
--- a/SCons/Utilities/sconsign.py
+++ b/SCons/Utilities/sconsign.py
@@ -484,9 +484,3 @@ def main() -> None:
 if __name__ == "__main__":
     main()
     sys.exit(0)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/BoolVariable.py b/SCons/Variables/BoolVariable.py
index 573a0244e7..34142bfba4 100644
--- a/SCons/Variables/BoolVariable.py
+++ b/SCons/Variables/BoolVariable.py
@@ -97,9 +97,3 @@ def BoolVariable(key, help: str, default) -> tuple[str, str, str, Callable, Call
     """
     help = f'{help} (yes|no)'
     return key, help, default, _validator, _text2bool
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/BoolVariableTests.py b/SCons/Variables/BoolVariableTests.py
index 6d950fe3a8..357beb7ffd 100644
--- a/SCons/Variables/BoolVariableTests.py
+++ b/SCons/Variables/BoolVariableTests.py
@@ -113,9 +113,3 @@ def test_validator(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/EnumVariable.py b/SCons/Variables/EnumVariable.py
index a576af513e..e6a4423b73 100644
--- a/SCons/Variables/EnumVariable.py
+++ b/SCons/Variables/EnumVariable.py
@@ -140,9 +140,3 @@ def converter_lcase(val):
         converter = converter_rcase
 
     return key, help, default, validator, converter
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/EnumVariableTests.py b/SCons/Variables/EnumVariableTests.py
index 41cb396768..05b752bcd4 100644
--- a/SCons/Variables/EnumVariableTests.py
+++ b/SCons/Variables/EnumVariableTests.py
@@ -205,9 +205,3 @@ def invalid(o, v) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/ListVariable.py b/SCons/Variables/ListVariable.py
index 90f563b56c..7060f9db11 100644
--- a/SCons/Variables/ListVariable.py
+++ b/SCons/Variables/ListVariable.py
@@ -229,9 +229,3 @@ def ListVariable(
         (help, '(all|none|comma-separated list of names)', names_str))
     converter = functools.partial(_converter, allowedElems=names, mapdict=map)
     return key, help, default, validator, converter
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/ListVariableTests.py b/SCons/Variables/ListVariableTests.py
index ca5a7935b0..3872e42624 100644
--- a/SCons/Variables/ListVariableTests.py
+++ b/SCons/Variables/ListVariableTests.py
@@ -170,9 +170,3 @@ def test_copy(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/PackageVariable.py b/SCons/Variables/PackageVariable.py
index df20bd26dc..08d1a52abe 100644
--- a/SCons/Variables/PackageVariable.py
+++ b/SCons/Variables/PackageVariable.py
@@ -128,9 +128,3 @@ def PackageVariable(
     validator = functools.partial(_validator, searchfunc=searchfunc)
     converter = functools.partial(_converter, default=default)
     return key, help, default, validator, converter
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/PackageVariableTests.py b/SCons/Variables/PackageVariableTests.py
index 8ef52433b6..8227f25bc1 100644
--- a/SCons/Variables/PackageVariableTests.py
+++ b/SCons/Variables/PackageVariableTests.py
@@ -145,9 +145,3 @@ def test_validator(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/PathVariable.py b/SCons/Variables/PathVariable.py
index f840a95d26..84f352b0b9 100644
--- a/SCons/Variables/PathVariable.py
+++ b/SCons/Variables/PathVariable.py
@@ -166,9 +166,3 @@ def __call__(
 
 
 PathVariable = _PathVariableClass()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/PathVariableTests.py b/SCons/Variables/PathVariableTests.py
index b093053d74..dee93ca51d 100644
--- a/SCons/Variables/PathVariableTests.py
+++ b/SCons/Variables/PathVariableTests.py
@@ -234,9 +234,3 @@ def my_validator(key, val, env):
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/VariablesTests.py b/SCons/Variables/VariablesTests.py
index c409db4022..bca6047efc 100644
--- a/SCons/Variables/VariablesTests.py
+++ b/SCons/Variables/VariablesTests.py
@@ -757,9 +757,3 @@ def test_VariableTypesImportVisibility(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Variables/__init__.py b/SCons/Variables/__init__.py
index ca18432153..5637c14240 100644
--- a/SCons/Variables/__init__.py
+++ b/SCons/Variables/__init__.py
@@ -460,9 +460,3 @@ def FormatVariableHelpText(
         if aliases:
             return self.aliasfmt % (key, help, default, actual, aliases)
         return self.fmt % (key, help, default, actual)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/Warnings.py b/SCons/Warnings.py
index b9f9cc16f4..758e9ed8f8 100644
--- a/SCons/Warnings.py
+++ b/SCons/Warnings.py
@@ -292,9 +292,3 @@ def _classmunge(s: str) -> str:
                 sys.stderr.write(f"Can not disable mandataory warning: {arg!r}\n")
             else:
                 suppressWarningClass(clazz)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/WarningsTests.py b/SCons/WarningsTests.py
index 70b459896e..e3ee890e87 100644
--- a/SCons/WarningsTests.py
+++ b/SCons/WarningsTests.py
@@ -121,9 +121,3 @@ def test_Disable(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/compat/__init__.py b/SCons/compat/__init__.py
index 0a9669d333..bbb182f553 100644
--- a/SCons/compat/__init__.py
+++ b/SCons/compat/__init__.py
@@ -96,9 +96,3 @@ def __new__(meta, name, bases, dct):
         if PYPY and '__slots__' in dct:
             dct.pop('__slots__')
         return super().__new__(meta, name, bases, dct)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/compat/_scons_dbm.py b/SCons/compat/_scons_dbm.py
index 72e5d6afec..5b3e208d83 100644
--- a/SCons/compat/_scons_dbm.py
+++ b/SCons/compat/_scons_dbm.py
@@ -34,9 +34,3 @@ class error(Exception):
 
 def open(*args, **kw):
     raise error()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/cpp.py b/SCons/cpp.py
index 63e49ae88c..bdd70189fd 100644
--- a/SCons/cpp.py
+++ b/SCons/cpp.py
@@ -676,9 +676,3 @@ def __init__(self, *args, **kw) -> None:
         d = self.default_table
         for func in ['if', 'elif', 'else', 'endif', 'ifdef', 'ifndef']:
             d[func] = d[func] = self.do_nothing
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/cppTests.py b/SCons/cppTests.py
index 8b079ec742..47614112f6 100644
--- a/SCons/cppTests.py
+++ b/SCons/cppTests.py
@@ -1168,9 +1168,3 @@ def scons_current_file(self, t):
             pass
         suite.addTests(list(map(tclass, names)))
     TestUnit.run(suite)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/dblite.py b/SCons/dblite.py
index e50b7f9ade..cb237f06df 100644
--- a/SCons/dblite.py
+++ b/SCons/dblite.py
@@ -343,9 +343,3 @@ def _exercise():
 
 if __name__ == "__main__":
     _exercise()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/SCons/exitfuncs.py b/SCons/exitfuncs.py
index d28bba4d00..b485dec78f 100644
--- a/SCons/exitfuncs.py
+++ b/SCons/exitfuncs.py
@@ -51,9 +51,3 @@ def register(func, *targs, **kargs) -> None:
 
 # make our exit function get run by python when it exits
 atexit.register(_run_exitfuncs)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/bench.py b/bench/bench.py
index bafe5a29d4..886cc836d6 100644
--- a/bench/bench.py
+++ b/bench/bench.py
@@ -202,9 +202,3 @@ def display(func, result_label, results):
         for test in tests:
             print(',%8.3f' % results_dict[implementation][test], file=r, end='')
         print(file=r)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/dependency-func.py b/bench/dependency-func.py
index 7313cf97eb..6c66572c92 100644
--- a/bench/dependency-func.py
+++ b/bench/dependency-func.py
@@ -96,9 +96,3 @@ class A:
         {},
     ),
 ]
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/env.__setitem__.py b/bench/env.__setitem__.py
index e915e46338..f742c2ba91 100644
--- a/bench/env.__setitem__.py
+++ b/bench/env.__setitem__.py
@@ -381,9 +381,3 @@ def run_it(title, init):
       common_imports + """
 import __main__ ; names = __main__.uniq_variable_names
 """)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/is_types.py b/bench/is_types.py
index ecc0edbdb0..3271ac9dc0 100644
--- a/bench/is_types.py
+++ b/bench/is_types.py
@@ -199,9 +199,3 @@ class A:
         {},
     ),
 ]
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/lvars-gvars.py b/bench/lvars-gvars.py
index 91d76a0c43..4d6506c5c5 100644
--- a/bench/lvars-gvars.py
+++ b/bench/lvars-gvars.py
@@ -100,9 +100,3 @@ def Func5(var, gvars, lvars):
         {},
     ),
 ]
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/Command.py b/bin/Command.py
index a7f94f6095..61680c0d85 100644
--- a/bin/Command.py
+++ b/bin/Command.py
@@ -98,7 +98,7 @@ def main(argv=None):
     long_options = ['help', 'no-exec', 'quiet']
 
     helpstr = """\
-Usage:  script-template.py [-hnq] 
+Usage:  script-template.py [-hnq]
 
   -h, --help                    Print this help and exit
   -n, --no-exec                 No execute, just print command lines
@@ -134,9 +134,3 @@ def main(argv=None):
 
 if __name__ == "__main__":
     sys.exit(main())
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py
index 2148f60029..ffd447d952 100644
--- a/bin/SConsDoc.py
+++ b/bin/SConsDoc.py
@@ -629,9 +629,3 @@ def importfile(path):
         return importlib._bootstrap._load(spec)
     except ImportError:
         raise Exception(path, sys.exc_info())
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/SConsExamples.py b/bin/SConsExamples.py
index 90205fef27..304172c998 100644
--- a/bin/SConsExamples.py
+++ b/bin/SConsExamples.py
@@ -936,10 +936,3 @@ def create_scons_output(e):
         s = stf.decorateWithHeader(stf.convertElementTree(sroot)[0])
         # Write it to file
         stf.writeTree(s, fpath)
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/caller-tree.py b/bin/caller-tree.py
index b2eab2820c..f76997d005 100644
--- a/bin/caller-tree.py
+++ b/bin/caller-tree.py
@@ -87,9 +87,3 @@ def print_entry(e, level, calls):
 
 for e in [ e for e in list(AllCalls.values()) if not e.calls ]:
     print_entry(e, 0, '')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/import-test.py b/bin/import-test.py
index d979017508..58bef36169 100644
--- a/bin/import-test.py
+++ b/bin/import-test.py
@@ -91,9 +91,3 @@ def recurse(n, d):
 sys.stdout.write('test.subdir(' + ',\n            '.join(subdir_list) + ')\n')
 
 print_files(Top)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/install_scons.py b/bin/install_scons.py
index fa260a79e2..49c1f42c91 100644
--- a/bin/install_scons.py
+++ b/bin/install_scons.py
@@ -231,9 +231,3 @@ def extract(tar_gz):
 
 if __name__ == "__main__":
     sys.exit(main())
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/memlogs.py b/bin/memlogs.py
index 223443a722..4f6b520169 100644
--- a/bin/memlogs.py
+++ b/bin/memlogs.py
@@ -40,9 +40,3 @@
     lines = [l for l in open(fname).readlines() if l[:7] == 'Memory ']
     t = tuple([l.split()[-1] for l in lines]) + (fname,)
     print(fmt % t)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/memoicmp.py b/bin/memoicmp.py
index d6aae13574..4143afbeda 100644
--- a/bin/memoicmp.py
+++ b/bin/memoicmp.py
@@ -73,9 +73,3 @@ def memoize_cmp(filea, fileb):
 
         memoize_cmp(sys.argv[1], sys.argv[2])
         sys.exit(0)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/objcounts.py b/bin/objcounts.py
index f387ad52ce..18fd2908bf 100644
--- a/bin/objcounts.py
+++ b/bin/objcounts.py
@@ -93,9 +93,3 @@ def printline(c1, c2, classname):
 
 for k in sorted(list(c2.keys())):
     printline(['--']*4, c2[k], k)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-diff.py b/bin/scons-diff.py
index a60337afeb..9bd1a32a5d 100644
--- a/bin/scons-diff.py
+++ b/bin/scons-diff.py
@@ -186,9 +186,3 @@ def diff_dir(left, right):
             print('Only in %s: %s' % (right, x))
 
 do_diff(left, right, True)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index 799b12a149..207ebd6ce2 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -26,10 +26,10 @@
   -f file(s)        dump function information to the specified file(s)
   -t file(s)        dump tool information to the specified file(s)
   -v file(s)        dump variable information to the specified file(s)
-  
+
   The "files" argument following a -[bftv] argument is expected to
   be a comma-separated pair of names like: foo.gen,foo.mod
-  
+
 """
 
 opts, args = getopt.getopt(sys.argv[1:],
@@ -105,17 +105,17 @@ def __init__(self, entries, **kw):
         self.values = entries
         for k, v in kw.items():
             setattr(self, k, v)
-            
+
     def fopen(self, name, mode='w'):
         if name == '-':
             return sys.stdout
         return open(name, mode)
-    
+
     def write(self, files):
         gen, mod = files.split(',')
         self.write_gen(gen)
         self.write_mod(mod)
-        
+
     def write_gen(self, filename):
         if not filename:
             return
@@ -123,12 +123,12 @@ def write_gen(self, filename):
         if filename.count(','):
             fl = filename.split(',')
             filename = fl[0]
-            
+
         # Start new XML file
         root = stf.newXmlTree("variablelist")
-        
+
         for v in self.values:
-            
+
             ve = stf.newNode("varlistentry")
             stf.setAttribute(ve, 'id', '%s%s' % (v.prefix, v.idfunc()))
             for t in v.xml_terms():
@@ -139,7 +139,7 @@ def write_gen(self, filename):
                 for s in v.summary:
                     added = True
                     stf.appendNode(vl, stf.copyNode(s))
-            
+
             if v.sets:
                 added = True
                 vp = stf.newNode("para")
@@ -157,21 +157,21 @@ def write_gen(self, filename):
                     stf.appendCvLink(vp, x, ', ')
                 stf.appendCvLink(vp, v.uses[-1], '.')
                 stf.appendNode(vl, vp)
-                
+
             # Still nothing added to this list item?
             if not added:
                 # Append an empty para
                 vp = stf.newNode("para")
                 stf.appendNode(vl, vp)
-                
+
             stf.appendNode(ve, vl)
             stf.appendNode(root, ve)
-            
-        # Write file        
+
+        # Write file
         f = self.fopen(filename)
         stf.writeGenTree(root, f)
         f.close()
-            
+
     def write_mod(self, filename):
         try:
             description = self.values[0].description
@@ -245,7 +245,7 @@ class SConsThing(Proxy):
     """Base class for the SConsDoc special elements"""
     def idfunc(self):
         return self.name
-    
+
     def xml_terms(self):
         e = stf.newNode("term")
         stf.setText(e, self.name)
@@ -256,7 +256,7 @@ class Builder(SConsThing):
     description = 'builder'
     prefix = 'b-'
     tag = 'function'
-    
+
     def xml_terms(self):
         """emit xml for an scons builder
 
@@ -279,7 +279,7 @@ def xml_terms(self):
         stf.setTail(meth, '()')
 
         return [gterm, mterm]
-            
+
     def entityfunc(self):
         return self.name
 
@@ -288,7 +288,7 @@ class Function(SConsThing):
     description = 'function'
     prefix = 'f-'
     tag = 'function'
-    
+
     def xml_terms(self):
         """emit xml for an scons function
 
@@ -343,7 +343,7 @@ def xml_terms(self):
         if not tlist:
             tlist.append(stf.newNode("term"))
         return tlist
-    
+
     def entityfunc(self):
         return self.name
 
@@ -352,10 +352,10 @@ class Tool(SConsThing):
     description = 'tool'
     prefix = 't-'
     tag = 'literal'
-    
+
     def idfunc(self):
         return self.name.replace('+', 'X')
-    
+
     def entityfunc(self):
         return self.name
 
@@ -370,7 +370,7 @@ def xml_terms(self):
         var = stf.newSubNode(term, Variable.tag)
         stf.setText(var, self.name)
         return [term]
-    
+
     def entityfunc(self):
         return '$' + self.name
 
@@ -380,17 +380,17 @@ def write_output_files(h, buildersfiles, functionsfiles,
         g = processor_class([Builder(b) for b in sorted(h.builders.values())],
                             env_signatures=True)
         write_func(g, buildersfiles)
-    
+
     if functionsfiles:
         g = processor_class([Function(b) for b in sorted(h.functions.values())],
                             env_signatures=True)
         write_func(g, functionsfiles)
-    
+
     if toolsfiles:
         g = processor_class([Tool(t) for t in sorted(h.tools.values())],
                             env_signatures=False)
         write_func(g, toolsfiles)
-    
+
     if variablesfiles:
         g = processor_class([Variable(v) for v in sorted(h.cvars.values())],
                             env_signatures=False)
@@ -419,9 +419,3 @@ def write_output_files(h, buildersfiles, functionsfiles,
 write_output_files(h, buildersfiles, functionsfiles, toolsfiles,
                    variablesfiles, SCons_XML.write)
 print("Done")
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-test.py b/bin/scons-test.py
index 868688c1ba..a4ce526ca5 100644
--- a/bin/scons-test.py
+++ b/bin/scons-test.py
@@ -261,9 +261,3 @@ def print_version_info(tag, module):
     command = '"%s" runtest.py %s' % (sys.executable, runtest_args)
     #print(command)
     os.system(command)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-time.py b/bin/scons-time.py
index d81d4c4e00..3bda55bcee 100644
--- a/bin/scons-time.py
+++ b/bin/scons-time.py
@@ -1508,9 +1508,3 @@ def _logfile_path_join(x):
         sys.exit(1)
 
     ST.execute_subcommand(args)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-unzip.py b/bin/scons-unzip.py
index 412c56ae38..22877146f4 100644
--- a/bin/scons-unzip.py
+++ b/bin/scons-unzip.py
@@ -67,9 +67,3 @@ def outname(n, outdir=outdir):
         os.unlink(dest)
     if not os.path.isdir(dest):
         open(dest, 'w').write(zf.read(name))
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index d54c1575c2..1e34fd7794 100755
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -39,7 +39,7 @@
     'rpm',
     'tar',
     'lynx',
-    
+
     # additional packages that Bill Deegan's web page suggests
     #'docbook-to-man',
     #'docbook2x',
@@ -223,9 +223,3 @@ def main(argv=None):
 
 if __name__ == "__main__":
     sys.exit(main())
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 4f7cf40035..eaa00314a9 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -338,9 +338,3 @@ def parse_arguments():
     rel_info = ReleaseInfo(options)
     UpdateFile.rel_info = rel_info
     main(options, rel_info)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/runtest.py b/runtest.py
index 405417b041..1688e18e06 100755
--- a/runtest.py
+++ b/runtest.py
@@ -924,9 +924,3 @@ def run(self):
     sys.exit(2)
 else:
     sys.exit(0)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/scripts/scons.py b/scripts/scons.py
index 9c5be9d484..a6a113f71f 100755
--- a/scripts/scons.py
+++ b/scripts/scons.py
@@ -95,9 +95,3 @@
     # this does all the work, and calls sys.exit
     # with the proper exit status when done.
     SCons.Script.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/scripts/sconsign.py b/scripts/sconsign.py
index a467ebafb5..1120aa33ea 100644
--- a/scripts/sconsign.py
+++ b/scripts/sconsign.py
@@ -87,9 +87,3 @@
 if __name__ == "__main__":
     main()
     sys.exit(0)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_files.py b/src/test_files.py
index fcb2b4cf5a..930224d62f 100644
--- a/src/test_files.py
+++ b/src/test_files.py
@@ -96,9 +96,3 @@ def build_path(*args):
     test.no_result(1)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_interrupts.py b/src/test_interrupts.py
index 1cac046b0b..1ec3cb468f 100644
--- a/src/test_interrupts.py
+++ b/src/test_interrupts.py
@@ -137,9 +137,3 @@
 test.fail_test(uncaughtKeyboardInterrupt)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_pychecker.py b/src/test_pychecker.py
index fdc8d2018e..a892309562 100644
--- a/src/test_pychecker.py
+++ b/src/test_pychecker.py
@@ -114,7 +114,7 @@
 
 for file in files:
 
-    args = (default_arguments + 
+    args = (default_arguments +
             per_file_arguments.get(file, []) +
             [os.path.join(src_engine, file)])
 
@@ -143,9 +143,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_setup.py b/src/test_setup.py
index 5db21a1e9a..4cc6e76d7d 100644
--- a/src/test_setup.py
+++ b/src/test_setup.py
@@ -327,9 +327,3 @@ def must_not_have_installed(self, paths):
 
 # All done.
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_strings.py b/src/test_strings.py
index 958cb1501b..b3e87fbd20 100644
--- a/src/test_strings.py
+++ b/src/test_strings.py
@@ -256,9 +256,3 @@ def must_be_built(self):
     test.no_result(1)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/template/Tests.py b/template/Tests.py
index a61531477d..17a877b107 100644
--- a/template/Tests.py
+++ b/template/Tests.py
@@ -27,9 +27,3 @@
 """
 
 import unittest
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/template/file.py b/template/file.py
index 8c95d01e3c..e9b32966e0 100644
--- a/template/file.py
+++ b/template/file.py
@@ -27,9 +27,3 @@
 """
 
 import XXX
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/template/test.py b/template/test.py
index 24bbcddf18..bffab7226e 100644
--- a/template/test.py
+++ b/template/test.py
@@ -39,9 +39,3 @@
 test.run(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AR/AR.py b/test/AR/AR.py
index fbf45569d9..84514785ec 100644
--- a/test/AR/AR.py
+++ b/test/AR/AR.py
@@ -97,9 +97,3 @@
 test.must_match('wrapper.out', 'wrapper.py\n', mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AR/ARCOM.py b/test/AR/ARCOM.py
index ddb5ba90c4..bf36420ceb 100644
--- a/test/AR/ARCOM.py
+++ b/test/AR/ARCOM.py
@@ -56,9 +56,3 @@
 test.must_match('output.lib', "file.1\nfile.2\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AR/ARCOMSTR.py b/test/AR/ARCOMSTR.py
index 593949ff88..89a1cf04bb 100644
--- a/test/AR/ARCOMSTR.py
+++ b/test/AR/ARCOMSTR.py
@@ -59,9 +59,3 @@
 test.must_match('output.lib', "file.1\nfile.2\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AR/ARFLAGS.py b/test/AR/ARFLAGS.py
index f1a0f98cbb..0ad157c7b1 100644
--- a/test/AR/ARFLAGS.py
+++ b/test/AR/ARFLAGS.py
@@ -96,9 +96,3 @@
 test.must_match('wrapper.out', 'wrapper.py\n', mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ARGLIST.py b/test/ARGLIST.py
index e246ba3220..4a11053a99 100644
--- a/test/ARGLIST.py
+++ b/test/ARGLIST.py
@@ -46,9 +46,3 @@
 test.run(arguments='a=1 bz=3 xx=sd zzz=foo=bar .', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ARGUMENTS.py b/test/ARGUMENTS.py
index 97c97c82a4..cb4b088b56 100644
--- a/test/ARGUMENTS.py
+++ b/test/ARGUMENTS.py
@@ -44,9 +44,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/AS.py b/test/AS/AS.py
index cd1c5fe456..70861d1941 100644
--- a/test/AS/AS.py
+++ b/test/AS/AS.py
@@ -100,9 +100,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASCOM.py b/test/AS/ASCOM.py
index 01add8cafa..cb61129163 100644
--- a/test/AS/ASCOM.py
+++ b/test/AS/ASCOM.py
@@ -82,9 +82,3 @@
 test.must_match('test8.shobj', "test8.ASM\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASCOMSTR.py b/test/AS/ASCOMSTR.py
index 956c97cb6d..3acac4acb2 100644
--- a/test/AS/ASCOMSTR.py
+++ b/test/AS/ASCOMSTR.py
@@ -75,9 +75,3 @@
 test.must_match('test4.obj', "test4.ASM\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASFLAGS.py b/test/AS/ASFLAGS.py
index bbc2188300..d8db7d91f7 100644
--- a/test/AS/ASFLAGS.py
+++ b/test/AS/ASFLAGS.py
@@ -98,9 +98,3 @@
 test.must_match('test6' + _exe, "%s\nThis is a .SPP file.\n" % o_c)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py
index b256ace597..4dd23534cc 100644
--- a/test/AS/ASPP.py
+++ b/test/AS/ASPP.py
@@ -71,14 +71,8 @@
 test.fail_test(test.read('test2' + _exe) != b"This is a .SPP file.\n")
 
 # Ensure the source scanner was run on test3.sx by
-# checking for foo.h in the dependency tree output 
+# checking for foo.h in the dependency tree output
 test.run(arguments = '. --tree=prune')
 test.fail_test("foo.h" not in test.stdout())
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py
index 5c4c7458c3..76cbfe6150 100644
--- a/test/AS/ASPPCOM.py
+++ b/test/AS/ASPPCOM.py
@@ -61,9 +61,3 @@
 test.must_match('test4.shobj', "test4.SPP\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py
index 030d8a598a..440619b43c 100644
--- a/test/AS/ASPPCOMSTR.py
+++ b/test/AS/ASPPCOMSTR.py
@@ -58,9 +58,3 @@
 test.must_match('test2.obj', "test2.SPP\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py
index 90f3f4bb95..f7abbeb9ab 100644
--- a/test/AS/ASPPFLAGS.py
+++ b/test/AS/ASPPFLAGS.py
@@ -65,9 +65,3 @@
 test.must_match('test2' + _exe, "%s\nThis is a .SPP file.\n" % o_c)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/as-live.py b/test/AS/as-live.py
index b44cd82e6e..0c4fc580fb 100644
--- a/test/AS/as-live.py
+++ b/test/AS/as-live.py
@@ -188,9 +188,3 @@
 test.unlink('wrapper.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ml.py b/test/AS/ml.py
index 5684fa87d7..a5cd296c78 100644
--- a/test/AS/ml.py
+++ b/test/AS/ml.py
@@ -56,7 +56,7 @@
 ddd.Program(target = 'ddd', source = ['ddd.asm', 'ddd_main.c'])
 """ % locals())
 
-test.write('ccc.asm', 
+test.write('ccc.asm',
 """
 DSEG	segment
         PUBLIC _name
@@ -65,8 +65,8 @@
         end
 """)
 
-test.write('ddd.asm', 
-"""        
+test.write('ddd.asm',
+"""
 DSEG	segment
         PUBLIC _name
 _name	byte "ddd.asm",0
@@ -113,9 +113,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/nasm.py b/test/AS/nasm.py
index fab041409f..337d17f9c1 100644
--- a/test/AS/nasm.py
+++ b/test/AS/nasm.py
@@ -141,9 +141,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/actions.py b/test/Actions/actions.py
index 72317ca786..f5dcc720b4 100644
--- a/test/Actions/actions.py
+++ b/test/Actions/actions.py
@@ -134,9 +134,3 @@ def func(env, target, source):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/addpost-link.py b/test/Actions/addpost-link.py
index 65a59b3897..04b631c1a0 100644
--- a/test/Actions/addpost-link.py
+++ b/test/Actions/addpost-link.py
@@ -67,9 +67,3 @@
 test.must_contain_all_lines(test.stdout(), [expect])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/append.py b/test/Actions/append.py
index dcc9898387..10573c1b17 100644
--- a/test/Actions/append.py
+++ b/test/Actions/append.py
@@ -66,9 +66,3 @@ def after(env, target, source):
 os.chmod(after_exe, os.stat(after_exe).st_mode | stat.S_IXUSR)
 test.run(program=after_exe, stdout="Foo\n")
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/exitstatfunc.py b/test/Actions/exitstatfunc.py
index 53e8477065..48a914441d 100644
--- a/test/Actions/exitstatfunc.py
+++ b/test/Actions/exitstatfunc.py
@@ -65,9 +65,3 @@ def fail(target, source, env):
 test.must_match('test2.out', "test2.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/function.py b/test/Actions/function.py
index 9b584d807e..77b9226630 100644
--- a/test/Actions/function.py
+++ b/test/Actions/function.py
@@ -199,9 +199,3 @@ def runtest(arguments, expectedOutFile, expectedRebuild=True, stderr=""):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/pre-post.py b/test/Actions/pre-post.py
index 14a9b85292..c9c3a627cf 100644
--- a/test/Actions/pre-post.py
+++ b/test/Actions/pre-post.py
@@ -127,9 +127,3 @@ def post_action(target, source, env):
 test.must_match(['work4', 'pre-post'], "pre file.in\npost file.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/subst_shell_env.py b/test/Actions/subst_shell_env.py
index 02ba640972..652f380555 100644
--- a/test/Actions/subst_shell_env.py
+++ b/test/Actions/subst_shell_env.py
@@ -40,9 +40,3 @@
 test.must_match('out2.txt', f"I_got_expanded_to_out2.txt{os.linesep}out2.txt_is_from_expansion{os.linesep}$EXPAND_THIS{os.linesep}")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/timestamp.py b/test/Actions/timestamp.py
index e13ec005a6..0e8c1f21cd 100644
--- a/test/Actions/timestamp.py
+++ b/test/Actions/timestamp.py
@@ -55,9 +55,3 @@ def my_copy(target, source, env):
 test.not_up_to_date(arguments = 'file.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/unicode-signature.py b/test/Actions/unicode-signature.py
index ef8c88803a..27fb43a9a9 100644
--- a/test/Actions/unicode-signature.py
+++ b/test/Actions/unicode-signature.py
@@ -51,9 +51,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddMethod.py b/test/AddMethod.py
index 6049ae2f9b..03023f4f6b 100644
--- a/test/AddMethod.py
+++ b/test/AddMethod.py
@@ -65,9 +65,3 @@ def foo(self):
 test.run(arguments = '-Q -q', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/args-and-targets.py b/test/AddOption/args-and-targets.py
index 856c868454..900a42f89b 100644
--- a/test/AddOption/args-and-targets.py
+++ b/test/AddOption/args-and-targets.py
@@ -58,9 +58,3 @@
 test.run('-Q -q --extra A TARG', status=1, stdout="A\n['TARG']\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/basic.py b/test/AddOption/basic.py
index f488c704cb..52b6847f4d 100644
--- a/test/AddOption/basic.py
+++ b/test/AddOption/basic.py
@@ -85,9 +85,3 @@
 test.run('-Q -q . --zcount=22', stdout="None\nNone\n22\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/help.py b/test/AddOption/help.py
index 772a381d63..6855a76a32 100644
--- a/test/AddOption/help.py
+++ b/test/AddOption/help.py
@@ -82,9 +82,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/longopts.py b/test/AddOption/longopts.py
index 668591b7b7..f5c6896dfc 100644
--- a/test/AddOption/longopts.py
+++ b/test/AddOption/longopts.py
@@ -62,9 +62,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/multi-arg.py b/test/AddOption/multi-arg.py
index 4361214b8d..f625277a18 100644
--- a/test/AddOption/multi-arg.py
+++ b/test/AddOption/multi-arg.py
@@ -116,9 +116,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/optional-arg.py b/test/AddOption/optional-arg.py
index 362da00ec4..d76b43db89 100644
--- a/test/AddOption/optional-arg.py
+++ b/test/AddOption/optional-arg.py
@@ -99,9 +99,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/Alias.py b/test/Alias/Alias.py
index 5915b2df7e..2911d3f08d 100644
--- a/test/Alias/Alias.py
+++ b/test/Alias/Alias.py
@@ -169,9 +169,3 @@
 test.up_to_date(arguments = 'f1.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/Depends.py b/test/Alias/Depends.py
index 8ab2ed6fa6..4238a14fce 100644
--- a/test/Alias/Depends.py
+++ b/test/Alias/Depends.py
@@ -161,9 +161,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/Dir-order.py b/test/Alias/Dir-order.py
index 86d0495c57..c6ac8e7f98 100644
--- a/test/Alias/Dir-order.py
+++ b/test/Alias/Dir-order.py
@@ -41,9 +41,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/action.py b/test/Alias/action.py
index 9a26be1dd4..af11e302b2 100644
--- a/test/Alias/action.py
+++ b/test/Alias/action.py
@@ -149,9 +149,3 @@ def string_it(target, source, env):
 test.must_contain_all(test.stdout(), 'string it: Goodbye')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/errors.py b/test/Alias/errors.py
index abac5d569d..e5d41efaae 100644
--- a/test/Alias/errors.py
+++ b/test/Alias/errors.py
@@ -41,9 +41,3 @@
          status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/scanner.py b/test/Alias/scanner.py
index 2d983c04d6..351e37cd38 100644
--- a/test/Alias/scanner.py
+++ b/test/Alias/scanner.py
@@ -55,9 +55,3 @@ def cat(env, source, target):
 test.fail_test(test.read('file.c') != b"file.x\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/srcdir.py b/test/Alias/srcdir.py
index 5115452bf1..ef74807411 100644
--- a/test/Alias/srcdir.py
+++ b/test/Alias/srcdir.py
@@ -99,9 +99,3 @@ def at_copy_ext(target, source, env):
 test.must_match(['python', 'out-scons', 'foo.py'], "python/foo.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AlwaysBuild.py b/test/AlwaysBuild.py
index 55e6f27bf2..c1fa21b86d 100644
--- a/test/AlwaysBuild.py
+++ b/test/AlwaysBuild.py
@@ -93,9 +93,3 @@ def dir_build(target, source, env):
 test.must_match('dir_build.txt', "dir_build()\ndir_build()\ndir_build()\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/Boolean.py b/test/Batch/Boolean.py
index f4bc2ce6d1..cf9d657ed3 100644
--- a/test/Batch/Boolean.py
+++ b/test/Batch/Boolean.py
@@ -73,9 +73,3 @@ def batch_build(target, source, env):
 test.must_match('f3b.out', "f3b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/CHANGED_SOURCES.py b/test/Batch/CHANGED_SOURCES.py
index 5899269194..5b856b0989 100644
--- a/test/Batch/CHANGED_SOURCES.py
+++ b/test/Batch/CHANGED_SOURCES.py
@@ -117,9 +117,3 @@
 test.must_match(['out3', 'f3b.out'], "f3b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/SOURCES.py b/test/Batch/SOURCES.py
index ea17224e4e..82516048d5 100644
--- a/test/Batch/SOURCES.py
+++ b/test/Batch/SOURCES.py
@@ -119,9 +119,3 @@
 test.must_match(['out3', 'f3b.out'], "f3b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/action-changed.py b/test/Batch/action-changed.py
index 771b876250..01a92b50f3 100644
--- a/test/Batch/action-changed.py
+++ b/test/Batch/action-changed.py
@@ -96,9 +96,3 @@
 test.must_match('f3.out', "two\nf3.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/callable.py b/test/Batch/callable.py
index cc7e8e371c..3a00cfe5d5 100644
--- a/test/Batch/callable.py
+++ b/test/Batch/callable.py
@@ -102,9 +102,3 @@ def batch_key(action, env, target, source):
 test.must_match(['sub2', 'f2b.out'], "f2b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/changed_sources_alwaysbuild.py b/test/Batch/changed_sources_alwaysbuild.py
index 5e278a5236..61355bc80b 100644
--- a/test/Batch/changed_sources_alwaysbuild.py
+++ b/test/Batch/changed_sources_alwaysbuild.py
@@ -45,9 +45,3 @@
 test.run()
 test.must_contain_all_lines(test.stdout(),['changed_sources_main.cpp'])
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/generated.py b/test/Batch/generated.py
index 59db0f82e6..08f67da3b8 100644
--- a/test/Batch/generated.py
+++ b/test/Batch/generated.py
@@ -77,9 +77,3 @@ def batch_build(target, source, env):
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/removed.py b/test/Batch/removed.py
index 60c2fbf852..ea41ce9360 100644
--- a/test/Batch/removed.py
+++ b/test/Batch/removed.py
@@ -104,9 +104,3 @@
 test.must_match(['out3', 'f3b.out'], "f3b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/up_to_date.py b/test/Batch/up_to_date.py
index ae73afbced..c6513723b5 100644
--- a/test/Batch/up_to_date.py
+++ b/test/Batch/up_to_date.py
@@ -86,9 +86,3 @@
 test.up_to_date(options = '--debug=explain', arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder-factories.py b/test/Builder-factories.py
index 229b4972a0..74d548083a 100644
--- a/test/Builder-factories.py
+++ b/test/Builder-factories.py
@@ -71,9 +71,3 @@ def collect(env, source, target):
 test.must_match("output", "src/file1\nsrc/file2\nsrc/file3\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/TargetSubst.py b/test/Builder/TargetSubst.py
index de4d724f7d..af0df8b500 100644
--- a/test/Builder/TargetSubst.py
+++ b/test/Builder/TargetSubst.py
@@ -44,9 +44,3 @@
 test.run(arguments = '.')
 test.must_match('infile.out', "infile\n")
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/add_src_builder.py b/test/Builder/add_src_builder.py
index 733d1b92a2..17d108fb19 100644
--- a/test/Builder/add_src_builder.py
+++ b/test/Builder/add_src_builder.py
@@ -63,9 +63,3 @@
 test.must_match('file1.out', "file1.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/different-actions.py b/test/Builder/different-actions.py
index 457639121a..85dc32c11b 100644
--- a/test/Builder/different-actions.py
+++ b/test/Builder/different-actions.py
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 """
-Verify that two builders in two environments with different 
+Verify that two builders in two environments with different
 actions generate an error.
 """
 
@@ -50,9 +50,3 @@
 test.run(arguments='out.txt', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/ensure_suffix.py b/test/Builder/ensure_suffix.py
index 08cf16e354..1890251894 100644
--- a/test/Builder/ensure_suffix.py
+++ b/test/Builder/ensure_suffix.py
@@ -53,9 +53,3 @@
 test.must_match('aa.bb.cc.dd.dll', "clean test\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/errors.py b/test/Builder/errors.py
index 8338377fa4..d157283add 100644
--- a/test/Builder/errors.py
+++ b/test/Builder/errors.py
@@ -95,9 +95,3 @@ def buildop(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-actions.py b/test/Builder/multi/different-actions.py
index 53141e8400..9a9ab93e21 100644
--- a/test/Builder/multi/different-actions.py
+++ b/test/Builder/multi/different-actions.py
@@ -60,9 +60,3 @@ def build(env, target, source):
 test.run(arguments='file6.out', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-environments.py b/test/Builder/multi/different-environments.py
index 41b59d81cc..19031357c8 100644
--- a/test/Builder/multi/different-environments.py
+++ b/test/Builder/multi/different-environments.py
@@ -67,9 +67,3 @@ def build(num, target, source):
 test.run(arguments='file03.out', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-multi.py b/test/Builder/multi/different-multi.py
index 0adabf7d74..a19e363818 100644
--- a/test/Builder/multi/different-multi.py
+++ b/test/Builder/multi/different-multi.py
@@ -65,9 +65,3 @@ def build2(env, target, source):
 test.run(arguments='file8.out', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-order.py b/test/Builder/multi/different-order.py
index 6fc800d5f6..9ee00f70b3 100644
--- a/test/Builder/multi/different-order.py
+++ b/test/Builder/multi/different-order.py
@@ -59,9 +59,3 @@ def build(env, target, source):
 test.run(arguments='file10.out', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-overrides.py b/test/Builder/multi/different-overrides.py
index 57418aa2b6..4b68737d16 100644
--- a/test/Builder/multi/different-overrides.py
+++ b/test/Builder/multi/different-overrides.py
@@ -58,9 +58,3 @@ def build(env, target, source):
 test.run(arguments='file3.out', stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-target-lists.py b/test/Builder/multi/different-target-lists.py
index 5c3ea76605..eda6da485e 100644
--- a/test/Builder/multi/different-target-lists.py
+++ b/test/Builder/multi/different-target-lists.py
@@ -64,9 +64,3 @@ def build(env, target, source):
 test.run(arguments='file11.out', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/error.py b/test/Builder/multi/error.py
index ae3f48d795..233d81e0b9 100644
--- a/test/Builder/multi/error.py
+++ b/test/Builder/multi/error.py
@@ -58,9 +58,3 @@ def build(env, target, source):
 test.run(arguments='file2.out', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/lone-target-list.py b/test/Builder/multi/lone-target-list.py
index 0a1450066b..79740ae9be 100644
--- a/test/Builder/multi/lone-target-list.py
+++ b/test/Builder/multi/lone-target-list.py
@@ -60,9 +60,3 @@ def build(env, target, source):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/multi.py b/test/Builder/multi/multi.py
index 140b8c4378..4dbfb53dba 100644
--- a/test/Builder/multi/multi.py
+++ b/test/Builder/multi/multi.py
@@ -56,9 +56,3 @@ def build(env, target, source):
 test.must_match('file1.out', "file1a.in\nfile1b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/same-actions.py b/test/Builder/multi/same-actions.py
index 7b56dd045d..d743ac97dc 100644
--- a/test/Builder/multi/same-actions.py
+++ b/test/Builder/multi/same-actions.py
@@ -62,9 +62,3 @@ def build(env, target, source):
 test.must_match('file5.out', "file5a.in\nfile5b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py
index 9b5698bca3..2d750f46c2 100644
--- a/test/Builder/multi/same-overrides.py
+++ b/test/Builder/multi/same-overrides.py
@@ -67,9 +67,3 @@ def build(num, target, source):
 test.must_match('file4.out', "3\nfile4a.in\nfile4b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/same-targets.py b/test/Builder/multi/same-targets.py
index f343a82e4e..42ea6daf28 100644
--- a/test/Builder/multi/same-targets.py
+++ b/test/Builder/multi/same-targets.py
@@ -58,9 +58,3 @@ def build(env, target, source):
 test.must_match('file9b.out', "file9a.in\nfile9b.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/non-multi.py b/test/Builder/non-multi.py
index 83fc5230d3..c33279edfb 100644
--- a/test/Builder/non-multi.py
+++ b/test/Builder/non-multi.py
@@ -59,9 +59,3 @@ def build(env, target, source):
 test.must_match('file8.out', "file8.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/not-a-Builder.py b/test/Builder/not-a-Builder.py
index f0a16b3654..80c5728f5c 100644
--- a/test/Builder/not-a-Builder.py
+++ b/test/Builder/not-a-Builder.py
@@ -52,9 +52,3 @@ def mkdir(env, target, source):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/same-actions-diff-envs.py b/test/Builder/same-actions-diff-envs.py
index 9d6fcbb049..820a6c849b 100644
--- a/test/Builder/same-actions-diff-envs.py
+++ b/test/Builder/same-actions-diff-envs.py
@@ -55,9 +55,3 @@ def build(env, target, source):
 test.must_match('out.txt', '1')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/same-actions-diff-overrides.py b/test/Builder/same-actions-diff-overrides.py
index cd7c1527d4..b51d260790 100644
--- a/test/Builder/same-actions-diff-overrides.py
+++ b/test/Builder/same-actions-diff-overrides.py
@@ -54,9 +54,3 @@ def build(env, target, source):
 test.must_match('out.txt', '1')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/srcdir.py b/test/Builder/srcdir.py
index d084f9380c..1ec54e23f3 100644
--- a/test/Builder/srcdir.py
+++ b/test/Builder/srcdir.py
@@ -75,9 +75,3 @@
 test.must_match(['src', 'output'],  expected)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/wrapper.py b/test/Builder/wrapper.py
index a4de067a88..d7a42bdf8f 100644
--- a/test/Builder/wrapper.py
+++ b/test/Builder/wrapper.py
@@ -69,9 +69,3 @@ def Wrapper(env, target, source):
 test.must_match('t2-f2.wout', "s-f2.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CC-live.py b/test/CC/CC-live.py
index 4848b0f5f8..6c2c5f66e7 100644
--- a/test/CC/CC-live.py
+++ b/test/CC/CC-live.py
@@ -59,9 +59,3 @@
 test.up_to_date(arguments='bar' + _exe)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CC.py b/test/CC/CC.py
index ecf126e416..15ad07be3b 100644
--- a/test/CC/CC.py
+++ b/test/CC/CC.py
@@ -68,9 +68,3 @@
     test.must_match('test2' + _exe, "This is a .C file.\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CCCOM.py b/test/CC/CCCOM.py
index 9ee49b446b..e21e64dd1d 100644
--- a/test/CC/CCCOM.py
+++ b/test/CC/CCCOM.py
@@ -64,9 +64,3 @@
 test.must_match('test2.obj', "test2.C\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CCCOMSTR.py b/test/CC/CCCOMSTR.py
index da07dd3d44..3a12626fd0 100644
--- a/test/CC/CCCOMSTR.py
+++ b/test/CC/CCCOMSTR.py
@@ -69,9 +69,3 @@
 test.must_match('test2.obj', "test2.C\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CCFLAGS-live.py b/test/CC/CCFLAGS-live.py
index ae280bcc22..bb927840bc 100644
--- a/test/CC/CCFLAGS-live.py
+++ b/test/CC/CCFLAGS-live.py
@@ -105,9 +105,3 @@
 test.run(program=test.workpath('bar'), stdout="prog.c:  BAR\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CCVERSION.py b/test/CC/CCVERSION.py
index b12849af0d..053ac1a180 100644
--- a/test/CC/CCVERSION.py
+++ b/test/CC/CCVERSION.py
@@ -48,9 +48,3 @@
 test.up_to_date(arguments = 'foo' + _exe)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CFLAGS-live.py b/test/CC/CFLAGS-live.py
index cae0b22eb2..cc02eebf5d 100644
--- a/test/CC/CFLAGS-live.py
+++ b/test/CC/CFLAGS-live.py
@@ -119,9 +119,3 @@
 test.run(program=test.workpath('bar'), stdout="prog.c:  BAR\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCC-live.py b/test/CC/SHCC-live.py
index 9da11d07b7..6b1b4f56da 100644
--- a/test/CC/SHCC-live.py
+++ b/test/CC/SHCC-live.py
@@ -55,9 +55,3 @@
 test.must_match('wrapper.out', "wrapper.py\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCCCOM.py b/test/CC/SHCCCOM.py
index eb05e9cd02..09022fe0af 100644
--- a/test/CC/SHCCCOM.py
+++ b/test/CC/SHCCCOM.py
@@ -64,9 +64,3 @@
 test.must_match('test2.obj', "test2.C\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCCCOMSTR.py b/test/CC/SHCCCOMSTR.py
index c24f9a93eb..ea85885ae7 100644
--- a/test/CC/SHCCCOMSTR.py
+++ b/test/CC/SHCCCOMSTR.py
@@ -71,9 +71,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCCFLAGS-live.py b/test/CC/SHCCFLAGS-live.py
index adaae10d13..6159f5db30 100644
--- a/test/CC/SHCCFLAGS-live.py
+++ b/test/CC/SHCCFLAGS-live.py
@@ -134,9 +134,3 @@
 test.run(program=test.workpath('barprog'), stdout="prog.c:  BAR\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCFLAGS-live.py b/test/CC/SHCFLAGS-live.py
index 9fa2136d3a..336098ffc2 100644
--- a/test/CC/SHCFLAGS-live.py
+++ b/test/CC/SHCFLAGS-live.py
@@ -134,9 +134,3 @@
 test.run(program=test.workpath('barprog'), stdout="prog.c:  BAR\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/gcc-version.py b/test/CC/gcc-version.py
index 8c72399fe6..8f32333f34 100644
--- a/test/CC/gcc-version.py
+++ b/test/CC/gcc-version.py
@@ -57,9 +57,3 @@
 test.run(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CFILESUFFIX.py b/test/CFILESUFFIX.py
index 2d24e25693..fb66a47141 100644
--- a/test/CFILESUFFIX.py
+++ b/test/CFILESUFFIX.py
@@ -75,9 +75,3 @@
 test.must_exist(test.workpath('f3.env2'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/append.py b/test/CPPDEFINES/append.py
index 32917abcb2..2e0a5274fd 100644
--- a/test/CPPDEFINES/append.py
+++ b/test/CPPDEFINES/append.py
@@ -342,9 +342,3 @@
 expect = test.wrap_stdout(build_str=build_output, read_str=expect_print_output)
 test.run(arguments='.', stdout=expect)
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/basic.py b/test/CPPDEFINES/basic.py
index a85e7eb36b..c70f6ab15a 100755
--- a/test/CPPDEFINES/basic.py
+++ b/test/CPPDEFINES/basic.py
@@ -104,9 +104,3 @@ def generator(target, source, env, for_signature):
 test.run(arguments = '.', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/live.py b/test/CPPDEFINES/live.py
index 6735721ace..64810dfb82 100644
--- a/test/CPPDEFINES/live.py
+++ b/test/CPPDEFINES/live.py
@@ -80,9 +80,3 @@
 test.run(program=test.workpath('baz'), stdout="baz.cpp:  BAZ 9\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/pkg-config.py b/test/CPPDEFINES/pkg-config.py
index cd8c9dc7b5..22fd7bbfa6 100644
--- a/test/CPPDEFINES/pkg-config.py
+++ b/test/CPPDEFINES/pkg-config.py
@@ -137,9 +137,3 @@ def __semi_deepcopy__(self):
 test.run(arguments='.', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/prepend.py b/test/CPPDEFINES/prepend.py
index fb61678a8a..72d7015007 100644
--- a/test/CPPDEFINES/prepend.py
+++ b/test/CPPDEFINES/prepend.py
@@ -341,9 +341,3 @@
 expect = test.wrap_stdout(build_str=build_output, read_str=expect_print_output)
 test.run(arguments='.', stdout=expect)
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/scan.py b/test/CPPDEFINES/scan.py
index 49cbec2409..a1f8e199fa 100644
--- a/test/CPPDEFINES/scan.py
+++ b/test/CPPDEFINES/scan.py
@@ -163,9 +163,3 @@
 test.run(program = test.workpath('f4'), stdout = "prog.c:  F4 again\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/undefined.py b/test/CPPDEFINES/undefined.py
index 749c63c1d4..f4623933f0 100644
--- a/test/CPPDEFINES/undefined.py
+++ b/test/CPPDEFINES/undefined.py
@@ -41,9 +41,3 @@
 test.run(arguments='.', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index ebae2df9f1..5a192353db 100644
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -79,7 +79,7 @@
 if TestSCons.case_sensitive_suffixes('.F', '.f'):
     test.must_match('mygcc.out', "cc\nc++\ng77\n")
 else:
-    test.must_match('mygcc.out', "cc\nc++\n")   
+    test.must_match('mygcc.out', "cc\nc++\n")
 
 test.write('SConstruct', """
 env = Environment(
@@ -127,12 +127,6 @@
 if TestSCons.case_sensitive_suffixes('.F', '.f'):
     test.must_match('mygcc.out', "cc\nc++\ng77\n")
 else:
-    test.must_match('mygcc.out', "cc\nc++\n")   
+    test.must_match('mygcc.out', "cc\nc++\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/CPPPATH.py b/test/CPPPATH/CPPPATH.py
index 73e0e099fe..c3893722b9 100644
--- a/test/CPPPATH/CPPPATH.py
+++ b/test/CPPPATH/CPPPATH.py
@@ -303,9 +303,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/Dir.py b/test/CPPPATH/Dir.py
index a0b1b32ac4..f39f428429 100644
--- a/test/CPPPATH/Dir.py
+++ b/test/CPPPATH/Dir.py
@@ -77,9 +77,3 @@
 test.run(program = test.workpath('prog' + _exe), stdout = "1\n2\n3\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/absolute-path.py b/test/CPPPATH/absolute-path.py
index dca01f0336..3234ef6fdf 100644
--- a/test/CPPPATH/absolute-path.py
+++ b/test/CPPPATH/absolute-path.py
@@ -92,9 +92,3 @@
 test.not_up_to_date(chdir = 'work', arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/expand-object.py b/test/CPPPATH/expand-object.py
index eec4ac815b..3e23e9cdc7 100644
--- a/test/CPPPATH/expand-object.py
+++ b/test/CPPPATH/expand-object.py
@@ -61,9 +61,3 @@ def __str__(self):
 test.must_exist(test.workpath('foo' + TestSCons._obj))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/function-expansion.py b/test/CPPPATH/function-expansion.py
index 3fb999fa4c..ce49691a82 100644
--- a/test/CPPPATH/function-expansion.py
+++ b/test/CPPPATH/function-expansion.py
@@ -134,9 +134,3 @@ def my_cpppaths( target, source, env, for_signature ):
 test.run(program = test.workpath('prog' + TestSCons._exe), stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/list-expansion.py b/test/CPPPATH/list-expansion.py
index 5e88320042..8e7979b616 100644
--- a/test/CPPPATH/list-expansion.py
+++ b/test/CPPPATH/list-expansion.py
@@ -130,9 +130,3 @@ def __call__(self, target, source, env, for_signature):
 test.run(program = test.workpath('test' + TestSCons._exe), stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/match-dir.py b/test/CPPPATH/match-dir.py
index 25b7011d3e..5e025b76f1 100644
--- a/test/CPPPATH/match-dir.py
+++ b/test/CPPPATH/match-dir.py
@@ -66,9 +66,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/nested-lists.py b/test/CPPPATH/nested-lists.py
index 86fb69b107..7d631ebb72 100644
--- a/test/CPPPATH/nested-lists.py
+++ b/test/CPPPATH/nested-lists.py
@@ -75,9 +75,3 @@
 test.run(program = test.workpath('prog' + _exe), stdout = "1\n2\n3\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/null.py b/test/CPPPATH/null.py
index b8c6841bbe..c173b68b66 100644
--- a/test/CPPPATH/null.py
+++ b/test/CPPPATH/null.py
@@ -53,9 +53,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/subdir-as-include.py b/test/CPPPATH/subdir-as-include.py
index 25ecd23521..e86013ede2 100644
--- a/test/CPPPATH/subdir-as-include.py
+++ b/test/CPPPATH/subdir-as-include.py
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
 
 """
-This is an obscure test case. When a file without a suffix is included in 
+This is an obscure test case. When a file without a suffix is included in
 a c++ build and there is a directory with the same name as that file in a
 sub-build directory, verify that an Errno 21 is not thrown upon trying to
 recursively scan the contents of includes. The Errno 21 indicates that
@@ -90,9 +90,3 @@
 test.run(program = test.workpath('inc1/build/one' + _exe), stdout = "1\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPSUFFIXES.py b/test/CPPSUFFIXES.py
index 9b8dd9089f..610be48b5a 100644
--- a/test/CPPSUFFIXES.py
+++ b/test/CPPSUFFIXES.py
@@ -163,9 +163,3 @@ def do_file(outf, inf):
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CC-variables.py b/test/CXX/CC-variables.py
index a2a2fbebe3..fea3dde0d8 100644
--- a/test/CXX/CC-variables.py
+++ b/test/CXX/CC-variables.py
@@ -48,9 +48,3 @@
 test.run(arguments = '-Q -n test.obj', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CCFLAGS-live.py b/test/CXX/CCFLAGS-live.py
index fcce9a32d4..bc0203bcfa 100644
--- a/test/CXX/CCFLAGS-live.py
+++ b/test/CXX/CCFLAGS-live.py
@@ -71,9 +71,3 @@
 test.run(program=test.workpath('bar'), stdout="prog.c:  BAR\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXX-live.py b/test/CXX/CXX-live.py
index 9f72b78e74..66d2d7eb07 100644
--- a/test/CXX/CXX-live.py
+++ b/test/CXX/CXX-live.py
@@ -79,9 +79,3 @@
 test.must_match('wrapper.out', "wrapper.py\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXX.py b/test/CXX/CXX.py
index baf2c3150a..04b5992edc 100644
--- a/test/CXX/CXX.py
+++ b/test/CXX/CXX.py
@@ -108,9 +108,3 @@
     test.must_match('test6' + _exe, "This is a .C file.\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXCOM.py b/test/CXX/CXXCOM.py
index 307ab13706..f6b22dedb2 100644
--- a/test/CXX/CXXCOM.py
+++ b/test/CXX/CXXCOM.py
@@ -66,9 +66,3 @@
 test.must_match('test6.obj', "test6.C\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXCOMSTR.py b/test/CXX/CXXCOMSTR.py
index f7494ca07d..5178b672b2 100644
--- a/test/CXX/CXXCOMSTR.py
+++ b/test/CXX/CXXCOMSTR.py
@@ -77,9 +77,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXFILESUFFIX.py b/test/CXX/CXXFILESUFFIX.py
index 1c551063b1..98f6e5cd2d 100644
--- a/test/CXX/CXXFILESUFFIX.py
+++ b/test/CXX/CXXFILESUFFIX.py
@@ -70,9 +70,3 @@
 test.must_exist(test.workpath('f3.env2'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXFLAGS-live.py b/test/CXX/CXXFLAGS-live.py
index d399096f95..15a3f84e14 100644
--- a/test/CXX/CXXFLAGS-live.py
+++ b/test/CXX/CXXFLAGS-live.py
@@ -159,9 +159,3 @@
 test.run(program=test.workpath('barprog'), stdout="doIt.cpp:  BAR\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXVERSION.py b/test/CXX/CXXVERSION.py
index 50ff8f842f..1862a979f4 100644
--- a/test/CXX/CXXVERSION.py
+++ b/test/CXX/CXXVERSION.py
@@ -74,9 +74,3 @@
 test.up_to_date(arguments = 'foo' + _exe)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCCFLAGS-live.py b/test/CXX/SHCCFLAGS-live.py
index 13b745fffc..9dfbff9829 100644
--- a/test/CXX/SHCCFLAGS-live.py
+++ b/test/CXX/SHCCFLAGS-live.py
@@ -134,9 +134,3 @@
 test.run(program=test.workpath('barprog'), stdout="prog.cpp:  BAR\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCXX-live.py b/test/CXX/SHCXX-live.py
index b7318d4b17..4db8b94cc0 100644
--- a/test/CXX/SHCXX-live.py
+++ b/test/CXX/SHCXX-live.py
@@ -80,9 +80,3 @@
 # test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCXXCOM.py b/test/CXX/SHCXXCOM.py
index 72e247a9f9..49b710bd49 100644
--- a/test/CXX/SHCXXCOM.py
+++ b/test/CXX/SHCXXCOM.py
@@ -67,9 +67,3 @@
 test.must_match('test6.obj', "test6.C\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCXXCOMSTR.py b/test/CXX/SHCXXCOMSTR.py
index 77075e4bf4..a98063ece3 100644
--- a/test/CXX/SHCXXCOMSTR.py
+++ b/test/CXX/SHCXXCOMSTR.py
@@ -75,9 +75,3 @@
 test.must_match('test6.obj', "test6.C\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCXXFLAGS-live.py b/test/CXX/SHCXXFLAGS-live.py
index 678e997d3d..769af1eb54 100644
--- a/test/CXX/SHCXXFLAGS-live.py
+++ b/test/CXX/SHCXXFLAGS-live.py
@@ -134,9 +134,3 @@
 test.run(program=test.workpath('barprog'), stdout="prog.cpp:  BAR\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/CACHEDIR_CLASS.py b/test/CacheDir/CACHEDIR_CLASS.py
index f0d6c480d5..182c48a304 100644
--- a/test/CacheDir/CACHEDIR_CLASS.py
+++ b/test/CacheDir/CACHEDIR_CLASS.py
@@ -39,9 +39,3 @@
 test.must_contain_all_lines(test.stdout(), ["MY_CUSTOM_CACHEDIR_CLASS"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/CacheDir.py b/test/CacheDir/CacheDir.py
index 45533b553c..9f6475a671 100644
--- a/test/CacheDir/CacheDir.py
+++ b/test/CacheDir/CacheDir.py
@@ -160,9 +160,3 @@ def cat(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/CacheDir_TryCompile.py b/test/CacheDir/CacheDir_TryCompile.py
index c9ab12643f..6b5795f53e 100644
--- a/test/CacheDir/CacheDir_TryCompile.py
+++ b/test/CacheDir/CacheDir_TryCompile.py
@@ -61,9 +61,3 @@
 test.run(chdir = 'src', arguments = '-c .')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/CustomCacheDir.py b/test/CacheDir/CustomCacheDir.py
index 1dac9a318f..83cd538c78 100644
--- a/test/CacheDir/CustomCacheDir.py
+++ b/test/CacheDir/CustomCacheDir.py
@@ -39,9 +39,3 @@
 test.must_contain_all_lines(test.stdout(), ["MY_CUSTOM_CACHEDIR_CLASS"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/DoubleCachedirClass.py b/test/CacheDir/DoubleCachedirClass.py
index 976793bd54..685732018a 100644
--- a/test/CacheDir/DoubleCachedirClass.py
+++ b/test/CacheDir/DoubleCachedirClass.py
@@ -58,9 +58,3 @@
 test.must_not_contain_any_line(test.stdout(), ["MY_CUSTOM_CACHEDIR_CLASS1"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/InvalidCustomCacheDir.py b/test/CacheDir/InvalidCustomCacheDir.py
index cc32b48a24..037a58156a 100644
--- a/test/CacheDir/InvalidCustomCacheDir.py
+++ b/test/CacheDir/InvalidCustomCacheDir.py
@@ -39,9 +39,3 @@
 test.must_contain_all_lines(test.stderr(), ["Custom CACHEDIR_CLASS <class 'SCons.Script.CustomCacheDir'> not derived from CacheDir"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/NoCache.py b/test/CacheDir/NoCache.py
index 611b555b5c..7e82b99b3a 100644
--- a/test/CacheDir/NoCache.py
+++ b/test/CacheDir/NoCache.py
@@ -74,9 +74,3 @@ def ActionWithUndeclaredInputs(target,source,env):
 test.must_match(['beta','bar_notcached'],   'beta')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/SideEffect.py b/test/CacheDir/SideEffect.py
index 88b3b043c0..9320a5bd0b 100644
--- a/test/CacheDir/SideEffect.py
+++ b/test/CacheDir/SideEffect.py
@@ -104,9 +104,3 @@ def build(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/VariantDir.py b/test/CacheDir/VariantDir.py
index 1b9d2bfa64..fa03bbc161 100644
--- a/test/CacheDir/VariantDir.py
+++ b/test/CacheDir/VariantDir.py
@@ -148,9 +148,3 @@ def cat(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/debug.py b/test/CacheDir/debug.py
index cf16f98d10..f291c0d742 100644
--- a/test/CacheDir/debug.py
+++ b/test/CacheDir/debug.py
@@ -193,9 +193,3 @@ def cat(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/environment.py b/test/CacheDir/environment.py
index 26655ce7fc..28f44a5f6c 100644
--- a/test/CacheDir/environment.py
+++ b/test/CacheDir/environment.py
@@ -167,9 +167,3 @@ def cat(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/multi-targets.py b/test/CacheDir/multi-targets.py
index 7c606afdf9..72c3352aae 100644
--- a/test/CacheDir/multi-targets.py
+++ b/test/CacheDir/multi-targets.py
@@ -70,9 +70,3 @@ def touch(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/multiple-targets.py b/test/CacheDir/multiple-targets.py
index dfde453df4..4e89517bc5 100644
--- a/test/CacheDir/multiple-targets.py
+++ b/test/CacheDir/multiple-targets.py
@@ -62,9 +62,3 @@ def touch(env, source, target):
 test.must_exist(test.workpath('bar'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/option--cd.py b/test/CacheDir/option--cd.py
index e3915880b4..6966bc79f8 100644
--- a/test/CacheDir/option--cd.py
+++ b/test/CacheDir/option--cd.py
@@ -125,9 +125,3 @@ def cat(env, source, target):
 
 # All done.
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/option--cf.py b/test/CacheDir/option--cf.py
index 52d107b7a0..fd5831a46b 100644
--- a/test/CacheDir/option--cf.py
+++ b/test/CacheDir/option--cf.py
@@ -121,9 +121,3 @@ def cat(env, source, target):
 
 # All done.
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/option--cr.py b/test/CacheDir/option--cr.py
index a1d32d2277..7a2650ed7a 100644
--- a/test/CacheDir/option--cr.py
+++ b/test/CacheDir/option--cr.py
@@ -129,9 +129,3 @@ def cat(env, source, target):
 
 # All done.
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/option--cs.py b/test/CacheDir/option--cs.py
index 4a0bb33ffa..494061c76b 100644
--- a/test/CacheDir/option--cs.py
+++ b/test/CacheDir/option--cs.py
@@ -195,9 +195,3 @@ def cat(env, source, target):
 
 # All done.
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/readonly-cache.py b/test/CacheDir/readonly-cache.py
index 579909959d..048009c9fe 100755
--- a/test/CacheDir/readonly-cache.py
+++ b/test/CacheDir/readonly-cache.py
@@ -71,9 +71,3 @@
 test.run(arguments = '--debug=explain --cache-debug=- .')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/scanner-target.py b/test/CacheDir/scanner-target.py
index 4aa36923fe..008e336f1e 100644
--- a/test/CacheDir/scanner-target.py
+++ b/test/CacheDir/scanner-target.py
@@ -71,9 +71,3 @@ def sillyScanner(node, env, dirs):
 test.must_not_exist(test.workpath('cache', 'N', 'None'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/source-scanner.py b/test/CacheDir/source-scanner.py
index 2ff19ce0ba..d2da805ed9 100644
--- a/test/CacheDir/source-scanner.py
+++ b/test/CacheDir/source-scanner.py
@@ -79,9 +79,3 @@ def sillyScanner(node, env, dirs):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/symlink.py b/test/CacheDir/symlink.py
index 36ca4be34f..bc03009bc5 100644
--- a/test/CacheDir/symlink.py
+++ b/test/CacheDir/symlink.py
@@ -68,9 +68,3 @@
 test.must_match('file.symlink', "file.txt\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/timestamp-match.py b/test/CacheDir/timestamp-match.py
index fd9c659bdd..49c519505a 100644
--- a/test/CacheDir/timestamp-match.py
+++ b/test/CacheDir/timestamp-match.py
@@ -51,9 +51,3 @@
 test.up_to_date(options='--cache-show --debug=explain', arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/timestamp-newer.py b/test/CacheDir/timestamp-newer.py
index 567078e8a6..a4252522c2 100644
--- a/test/CacheDir/timestamp-newer.py
+++ b/test/CacheDir/timestamp-newer.py
@@ -52,9 +52,3 @@
 test.up_to_date(options='--cache-show --debug=explain', arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/up-to-date-q.py b/test/CacheDir/up-to-date-q.py
index 5c71ab97ae..8d4d1ad244 100644
--- a/test/CacheDir/up-to-date-q.py
+++ b/test/CacheDir/up-to-date-q.py
@@ -78,9 +78,3 @@
 test.run(chdir = 'beta', arguments = '. -q')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/value_dependencies.py b/test/CacheDir/value_dependencies.py
index 37c6153a17..1b3659b912 100644
--- a/test/CacheDir/value_dependencies.py
+++ b/test/CacheDir/value_dependencies.py
@@ -42,9 +42,3 @@
 test.run(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Case.py b/test/Case.py
index 193da54d79..94ce8212b3 100644
--- a/test/Case.py
+++ b/test/Case.py
@@ -83,9 +83,3 @@
     test.run(program = test.workpath('main' + _exe), stdout = "foo\nbar\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Chmod.py b/test/Chmod.py
index c1a83422b3..a7e1f254be 100644
--- a/test/Chmod.py
+++ b/test/Chmod.py
@@ -244,9 +244,3 @@ def cat(env, source, target):
 test.fail_test(s != 0o777)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clang/clang_default_environment.py b/test/Clang/clang_default_environment.py
index 41bb44e15f..72ed41a3dc 100644
--- a/test/Clang/clang_default_environment.py
+++ b/test/Clang/clang_default_environment.py
@@ -54,9 +54,3 @@
 test.fail_test(not test.stdout() == 'Hello!')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clang/clang_shared_library.py b/test/Clang/clang_shared_library.py
index 4f3e50d120..78c295fa59 100644
--- a/test/Clang/clang_shared_library.py
+++ b/test/Clang/clang_shared_library.py
@@ -65,9 +65,3 @@
 test.must_exist(test.workpath(libraryname))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clang/clang_specific_environment.py b/test/Clang/clang_specific_environment.py
index 10637e6635..f1eaf4b934 100644
--- a/test/Clang/clang_specific_environment.py
+++ b/test/Clang/clang_specific_environment.py
@@ -52,9 +52,3 @@
 test.fail_test(not test.stdout() == 'Hello!')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clang/clang_static_library.py b/test/Clang/clang_static_library.py
index c0d86d19c5..5db648eb6d 100644
--- a/test/Clang/clang_static_library.py
+++ b/test/Clang/clang_static_library.py
@@ -60,9 +60,3 @@
 test.must_exist(test.workpath(foo_lib))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clang/clangxx_default_environment.py b/test/Clang/clangxx_default_environment.py
index ef5929e7dc..3128bf21bf 100644
--- a/test/Clang/clangxx_default_environment.py
+++ b/test/Clang/clangxx_default_environment.py
@@ -54,9 +54,3 @@
 test.fail_test(not test.stdout() == 'Hello!\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clang/clangxx_shared_library.py b/test/Clang/clangxx_shared_library.py
index 8471aa1680..70e85cf75e 100644
--- a/test/Clang/clangxx_shared_library.py
+++ b/test/Clang/clangxx_shared_library.py
@@ -69,9 +69,3 @@
 test.must_exist(test.workpath(libraryname))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clang/clangxx_specific_environment.py b/test/Clang/clangxx_specific_environment.py
index f26ebf92c8..2b93c82238 100644
--- a/test/Clang/clangxx_specific_environment.py
+++ b/test/Clang/clangxx_specific_environment.py
@@ -52,9 +52,3 @@
 test.fail_test(not test.stdout() == 'Hello!\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clang/clangxx_static_library.py b/test/Clang/clangxx_static_library.py
index d697f1a9f5..d0f1f0ec64 100644
--- a/test/Clang/clangxx_static_library.py
+++ b/test/Clang/clangxx_static_library.py
@@ -60,9 +60,3 @@
 test.must_exist(test.workpath(foo_lib))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clean/Option.py b/test/Clean/Option.py
index 8616092ccf..6d443d7f4e 100644
--- a/test/Clean/Option.py
+++ b/test/Clean/Option.py
@@ -75,9 +75,3 @@
 test.must_not_exist(test.workpath('foo.out'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clean/basic.py b/test/Clean/basic.py
index ee510cbbde..4599f015b7 100644
--- a/test/Clean/basic.py
+++ b/test/Clean/basic.py
@@ -177,9 +177,3 @@ def symlink2(env, target, source):
 test.must_exist(test.workpath('touch2.out'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clean/function.py b/test/Clean/function.py
index 2476e61143..803bb22680 100644
--- a/test/Clean/function.py
+++ b/test/Clean/function.py
@@ -111,9 +111,3 @@
 test.must_not_exist(test.workpath('subdir'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clean/mkfifo.py b/test/Clean/mkfifo.py
index 62d19d0465..e1eeabc044 100644
--- a/test/Clean/mkfifo.py
+++ b/test/Clean/mkfifo.py
@@ -73,9 +73,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clean/symlinks.py b/test/Clean/symlinks.py
index 05fb08be53..c7cd8f73e0 100644
--- a/test/Clean/symlinks.py
+++ b/test/Clean/symlinks.py
@@ -55,9 +55,3 @@
 test.run(arguments = '-c -Q -q', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/U-Default-dir.py b/test/Climb/U-Default-dir.py
index f26fe75fcc..87d97c3f0d 100644
--- a/test/Climb/U-Default-dir.py
+++ b/test/Climb/U-Default-dir.py
@@ -40,9 +40,3 @@
 test.run(arguments = '-U')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/U-Default-no-target.py b/test/Climb/U-Default-no-target.py
index 331863e210..61a32e8c5d 100644
--- a/test/Climb/U-Default-no-target.py
+++ b/test/Climb/U-Default-no-target.py
@@ -42,9 +42,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/U-no-Default.py b/test/Climb/U-no-Default.py
index 940414b934..d81e65828d 100644
--- a/test/Climb/U-no-Default.py
+++ b/test/Climb/U-no-Default.py
@@ -39,9 +39,3 @@
          status = 2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent--D.py b/test/Climb/explicit-parent--D.py
index 1d5c7460bd..0733291c34 100644
--- a/test/Climb/explicit-parent--D.py
+++ b/test/Climb/explicit-parent--D.py
@@ -71,9 +71,3 @@ def cat(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent--U.py b/test/Climb/explicit-parent--U.py
index e129b4aedd..5cce4a7356 100644
--- a/test/Climb/explicit-parent--U.py
+++ b/test/Climb/explicit-parent--U.py
@@ -64,9 +64,3 @@ def cat(env, source, target):
 test.must_not_exist(test.workpath('subdir', 'bar.out'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent-u.py b/test/Climb/explicit-parent-u.py
index 337e0b3827..bfb66578e3 100644
--- a/test/Climb/explicit-parent-u.py
+++ b/test/Climb/explicit-parent-u.py
@@ -70,9 +70,3 @@ def cat(env, source, target):
 test.must_not_exist(test.workpath('dir', 'f4.out'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/filename--D.py b/test/Climb/filename--D.py
index 38a337b204..58469497d0 100644
--- a/test/Climb/filename--D.py
+++ b/test/Climb/filename--D.py
@@ -71,9 +71,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/filename--U.py b/test/Climb/filename--U.py
index f14593374a..27ad636b96 100644
--- a/test/Climb/filename--U.py
+++ b/test/Climb/filename--U.py
@@ -69,9 +69,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/filename-u.py b/test/Climb/filename-u.py
index 4806c16c63..361b7e0507 100644
--- a/test/Climb/filename-u.py
+++ b/test/Climb/filename-u.py
@@ -69,9 +69,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/option--D.py b/test/Climb/option--D.py
index 169678aef5..cc25dc4838 100644
--- a/test/Climb/option--D.py
+++ b/test/Climb/option--D.py
@@ -81,9 +81,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/option--U.py b/test/Climb/option--U.py
index 8c34462b45..313824fe89 100644
--- a/test/Climb/option--U.py
+++ b/test/Climb/option--U.py
@@ -136,9 +136,3 @@
 test.must_not_exist(test.workpath('sub2/xxx.out'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/option-u.py b/test/Climb/option-u.py
index de98040786..3c617d2449 100644
--- a/test/Climb/option-u.py
+++ b/test/Climb/option-u.py
@@ -140,9 +140,3 @@ def cat(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clone-Variables.py b/test/Clone-Variables.py
index 383caeafbb..495c03f73a 100644
--- a/test/Clone-Variables.py
+++ b/test/Clone-Variables.py
@@ -55,9 +55,3 @@
 test.run(arguments = '-q -Q', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clone-compatibility.py b/test/Clone-compatibility.py
index 38cbeb3191..830523984a 100644
--- a/test/Clone-compatibility.py
+++ b/test/Clone-compatibility.py
@@ -57,9 +57,3 @@
 test.run(arguments = '-q -Q', stdout = "1\n2\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Command.py b/test/Command.py
index 687c13fffb..8f9b67823f 100644
--- a/test/Command.py
+++ b/test/Command.py
@@ -162,9 +162,3 @@ def factory(node,*lst,**kw):
                 "expand_chdir_sub/f11.in\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CommandGenerator.py b/test/CommandGenerator.py
index 5cae4a6bf0..29b4c285b1 100644
--- a/test/CommandGenerator.py
+++ b/test/CommandGenerator.py
@@ -66,9 +66,3 @@ def g(source, target, for_signature, env):
 test.must_match('foo3.out','foo3.in\n', mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/Action-error.py b/test/Configure/Action-error.py
index 5021e1cc49..5d9b1e73ed 100644
--- a/test/Configure/Action-error.py
+++ b/test/Configure/Action-error.py
@@ -47,9 +47,3 @@ def ConfigureAction(target, source, env):
 test.run(status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/Builder-call.py b/test/Configure/Builder-call.py
index bbe3366f06..86710861aa 100644
--- a/test/Configure/Builder-call.py
+++ b/test/Configure/Builder-call.py
@@ -56,9 +56,3 @@ def CustomTest(*args):
 test.run(stderr="Hello World on stderr\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/CONFIGUREDIR.py b/test/Configure/CONFIGUREDIR.py
index 4777b823fc..274e84342c 100644
--- a/test/Configure/CONFIGUREDIR.py
+++ b/test/Configure/CONFIGUREDIR.py
@@ -49,9 +49,3 @@ def CustomTest(context):
 test.must_exist('custom_config_dir')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/CONFIGURELOG.py b/test/Configure/CONFIGURELOG.py
index 7ced290473..0870a07503 100644
--- a/test/Configure/CONFIGURELOG.py
+++ b/test/Configure/CONFIGURELOG.py
@@ -60,9 +60,3 @@ def CustomTest(context):
 test.must_match('custom.logfile', expect, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/CheckLibWithHeader_extra_libs.py b/test/Configure/CheckLibWithHeader_extra_libs.py
index b9c920cf0a..1e179266ff 100644
--- a/test/Configure/CheckLibWithHeader_extra_libs.py
+++ b/test/Configure/CheckLibWithHeader_extra_libs.py
@@ -46,9 +46,3 @@
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/ConfigureDryRunError.py b/test/Configure/ConfigureDryRunError.py
index ae3b2ff1ad..ce3e9f3da7 100644
--- a/test/Configure/ConfigureDryRunError.py
+++ b/test/Configure/ConfigureDryRunError.py
@@ -119,9 +119,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/SConscript.py b/test/Configure/SConscript.py
index 8378f85560..06f7531bf4 100644
--- a/test/Configure/SConscript.py
+++ b/test/Configure/SConscript.py
@@ -72,9 +72,3 @@
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/Streamer1.py b/test/Configure/Streamer1.py
index c2312be91b..c1e27e0bbc 100644
--- a/test/Configure/Streamer1.py
+++ b/test/Configure/Streamer1.py
@@ -77,9 +77,3 @@ def CheckHello(context):
 test.must_not_exist('traceback')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/VariantDir-SConscript.py b/test/Configure/VariantDir-SConscript.py
index cb50d3afe2..c7d975146c 100644
--- a/test/Configure/VariantDir-SConscript.py
+++ b/test/Configure/VariantDir-SConscript.py
@@ -157,9 +157,3 @@ def CustomTest(context):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/VariantDir.py b/test/Configure/VariantDir.py
index a883d48d32..ad8536db8a 100644
--- a/test/Configure/VariantDir.py
+++ b/test/Configure/VariantDir.py
@@ -79,7 +79,7 @@
                       os.path.join("build", "config.log"),
                       os.path.join("build", "config.tests"),
                       "SConstruct")
-    
+
 test.run()
 test.checkLogAndStdout(["Checking for C header file math.h... ",
                        "Checking for C header file no_std_c_header.h... "],
@@ -91,9 +91,3 @@
                       "SConstruct")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/basic.py b/test/Configure/basic.py
index 9d555659f5..dc16488f38 100644
--- a/test/Configure/basic.py
+++ b/test/Configure/basic.py
@@ -83,9 +83,3 @@
                       "config.log", ".sconf_temp", "SConstruct")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/build-fail.py b/test/Configure/build-fail.py
index 21d4b5e079..241d72f806 100644
--- a/test/Configure/build-fail.py
+++ b/test/Configure/build-fail.py
@@ -89,9 +89,3 @@ def _check(context):
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/cache-not-ok.py b/test/Configure/cache-not-ok.py
index 04a348658d..1e783f2750 100644
--- a/test/Configure/cache-not-ok.py
+++ b/test/Configure/cache-not-ok.py
@@ -94,9 +94,3 @@
                       "config.log", ".sconf_temp", "SConstruct")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/cache-ok.py b/test/Configure/cache-ok.py
index a2ef8fa216..dbc12ecaf6 100644
--- a/test/Configure/cache-ok.py
+++ b/test/Configure/cache-ok.py
@@ -73,8 +73,8 @@
                       [[((".c", NCR), (_obj, NCR), (_exe, NCR))]]*4 +
                         [[((".c", NCR), (_obj, NCR))]] +
                         [[((".cpp", NCR), (_obj, NCR))]],
-                      "config.log", ".sconf_temp", "SConstruct")    
-    
+                      "config.log", ".sconf_temp", "SConstruct")
+
 
 test.run()
 test.checkLogAndStdout(["Checking for C library %s... " % lib,
@@ -102,7 +102,7 @@
                       [[((".c", NCR), (_obj, NCR), (_exe, NCR))]]*4 +
                         [[((".c", NCR), (_obj, NCR))]] +
                         [[((".cpp", NCR), (_obj, NCR))]],
-                      "config.log", ".sconf_temp", "SConstruct")    
+                      "config.log", ".sconf_temp", "SConstruct")
 
 test.run(arguments='target_signatures_content=1')
 test.checkLogAndStdout(["Checking for C library %s... " % lib,
@@ -115,12 +115,6 @@
                       [[((".c", CR), (_obj, CR), (_exe, CR))]]*4 +
                        [[((".c", CR), (_obj, CR))]] +
                        [[((".cpp", CR), (_obj, CR))]],
-                      "config.log", ".sconf_temp", "SConstruct")    
+                      "config.log", ".sconf_temp", "SConstruct")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/clean.py b/test/Configure/clean.py
index 19e4879a2a..e86c726062 100644
--- a/test/Configure/clean.py
+++ b/test/Configure/clean.py
@@ -76,9 +76,3 @@
 test.must_contain_all_lines(test.stdout(), lines)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/config-h.py b/test/Configure/config-h.py
index 221e3bd209..8e75b7b24d 100644
--- a/test/Configure/config-h.py
+++ b/test/Configure/config-h.py
@@ -87,7 +87,7 @@
 expected_build_str = """\
 scons: Configure: creating config.h
 """
-    
+
 expected_stdout = test.wrap_stdout(build_str=expected_build_str,
                                        read_str=expected_read_str)
 
@@ -174,7 +174,7 @@
                                    read_str=expected_read_str)
 #expected_stdout = expected_stdout.replace("\n", os.linesep)
 
-test.run(stdout=expected_stdout)    
+test.run(stdout=expected_stdout)
 
 config_h = test.read(test.workpath('config.h'),mode='r')
 if expected_config_h != config_h:
@@ -194,9 +194,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/conftest_source_file.py b/test/Configure/conftest_source_file.py
index 879c43656b..48c66da405 100644
--- a/test/Configure/conftest_source_file.py
+++ b/test/Configure/conftest_source_file.py
@@ -29,7 +29,7 @@
 """
 
 import textwrap
-import os 
+import os
 
 import TestSCons
 
@@ -61,9 +61,3 @@
 test.up_to_date(read_str=conf_text.format(arg1='(cached) ', arg2='(cached) '))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/custom-tests.py b/test/Configure/custom-tests.py
index 9a6d0f61ab..052d7888fb 100644
--- a/test/Configure/custom-tests.py
+++ b/test/Configure/custom-tests.py
@@ -194,9 +194,3 @@ def CheckEmptyDict(test):
 match=TestSCons.match_re)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/from-SConscripts.py b/test/Configure/from-SConscripts.py
index 17d975b0e7..64d8833c19 100644
--- a/test/Configure/from-SConscripts.py
+++ b/test/Configure/from-SConscripts.py
@@ -55,9 +55,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/help.py b/test/Configure/help.py
index b7184eea93..89aff998c4 100644
--- a/test/Configure/help.py
+++ b/test/Configure/help.py
@@ -86,9 +86,3 @@
 test.must_contain_all_lines(test.stdout(), lines)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/implicit-cache.py b/test/Configure/implicit-cache.py
index f5fdd4b42b..306a11ae97 100644
--- a/test/Configure/implicit-cache.py
+++ b/test/Configure/implicit-cache.py
@@ -124,9 +124,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/is_conftest/is_conftest.py b/test/Configure/is_conftest/is_conftest.py
index 8dab66df99..5d018bac24 100644
--- a/test/Configure/is_conftest/is_conftest.py
+++ b/test/Configure/is_conftest/is_conftest.py
@@ -39,9 +39,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/issue-2906-useful-duplicate-configure-message.py b/test/Configure/issue-2906-useful-duplicate-configure-message.py
index 8fe3f8fe4d..1e3cd7c597 100644
--- a/test/Configure/issue-2906-useful-duplicate-configure-message.py
+++ b/test/Configure/issue-2906-useful-duplicate-configure-message.py
@@ -26,7 +26,7 @@
 """
 Verify useful error message when you create a second Configure context without
 finalizing the previous one via conf.Finish()
-This addresses Issue 2906: 
+This addresses Issue 2906:
 https://github.com/SCons/scons/issues/2906
 """
 
@@ -47,9 +47,3 @@
 test.run(stderr=expected_stderr, stdout=expected_stdout, status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/issue-3469/issue-3469.py b/test/Configure/issue-3469/issue-3469.py
index e29e179e20..785900d65e 100644
--- a/test/Configure/issue-3469/issue-3469.py
+++ b/test/Configure/issue-3469/issue-3469.py
@@ -25,9 +25,9 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
-Verify that changing the order and/or number of config tests does not reuse 
+Verify that changing the order and/or number of config tests does not reuse
 incorrect temporary test files on successive runs.
-This addresses Issue 3469: 
+This addresses Issue 3469:
 https://github.com/SCons/scons/issues/3469
 """
 
@@ -85,9 +85,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/option--Q.py b/test/Configure/option--Q.py
index 8316ab0268..2f91c79174 100644
--- a/test/Configure/option--Q.py
+++ b/test/Configure/option--Q.py
@@ -44,9 +44,3 @@
 test.run(arguments='-Q', stdout="scons: `.' is up to date.\n", stderr="")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/option--config.py b/test/Configure/option--config.py
index 4c3d7abc47..c596f46119 100644
--- a/test/Configure/option--config.py
+++ b/test/Configure/option--config.py
@@ -90,14 +90,14 @@
 test.run(arguments='--config=auto')
 test.checkConfigureLogAndStdout(checks=[
     ConfigCheckInfo("Checking for C header file non_system_header0.h... ",
-                    'yes', 
-                    [((".c", NCR), 
+                    'yes',
+                    [((".c", NCR),
                     (_obj, NCR))],
                     conftest_0_base
                     ),
     ConfigCheckInfo("Checking for C header file non_system_header1.h... ",
-                    'no', 
-                    [((".c", NCR), 
+                    'no',
+                    [((".c", NCR),
                     (_obj, NCF))],
                     conftest_1_base)]
 )
@@ -211,9 +211,3 @@
 test.fail_test('test_main.o' in test.stdout())
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ConstructionEnvironment.py b/test/ConstructionEnvironment.py
index e25f86acc8..b9cce80c0c 100644
--- a/test/ConstructionEnvironment.py
+++ b/test/ConstructionEnvironment.py
@@ -47,9 +47,3 @@
 test.run(arguments = '.', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Copy-Action.py b/test/Copy-Action.py
index c591011ad4..6073dc33c9 100644
--- a/test/Copy-Action.py
+++ b/test/Copy-Action.py
@@ -196,9 +196,3 @@ def must_be_same(f1, f2):
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Copy-Option.py b/test/Copy-Option.py
index 170dbbe20a..0989606d33 100644
--- a/test/Copy-Option.py
+++ b/test/Copy-Option.py
@@ -54,9 +54,3 @@
 test.run(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Copy-Symlinks.py b/test/Copy-Symlinks.py
index d2f5f4be7a..edce3c68ed 100644
--- a/test/Copy-Symlinks.py
+++ b/test/Copy-Symlinks.py
@@ -203,9 +203,3 @@
 test.fail_test( condition=(os.readlink(rellinkToCopy) != os.readlink( L10 )) )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/AllAtOnce/Common/common.py b/test/D/AllAtOnce/Common/common.py
index 0d87213c82..8da30704e5 100644
--- a/test/D/AllAtOnce/Common/common.py
+++ b/test/D/AllAtOnce/Common/common.py
@@ -73,9 +73,3 @@ def testForTool(tool):
     test.must_not_exist(test.workpath('project'))
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/AllAtOnce/sconstest-dmd.py b/test/D/AllAtOnce/sconstest-dmd.py
index df662556f0..86c7cbf896 100644
--- a/test/D/AllAtOnce/sconstest-dmd.py
+++ b/test/D/AllAtOnce/sconstest-dmd.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/AllAtOnce/sconstest-gdc.py b/test/D/AllAtOnce/sconstest-gdc.py
index 7ac95c0865..2f28c3a0a5 100644
--- a/test/D/AllAtOnce/sconstest-gdc.py
+++ b/test/D/AllAtOnce/sconstest-gdc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/AllAtOnce/sconstest-ldc.py b/test/D/AllAtOnce/sconstest-ldc.py
index f9ab34295e..34c28cdeaa 100644
--- a/test/D/AllAtOnce/sconstest-ldc.py
+++ b/test/D/AllAtOnce/sconstest-ldc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/CoreScanner/Common/common.py b/test/D/CoreScanner/Common/common.py
index d6a6280000..986c919db5 100644
--- a/test/D/CoreScanner/Common/common.py
+++ b/test/D/CoreScanner/Common/common.py
@@ -93,9 +93,3 @@ def testForTool(tool):
     test.up_to_date(arguments=arguments)
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/CoreScanner/sconstest-dmd.py b/test/D/CoreScanner/sconstest-dmd.py
index df6ddebd0f..c2fe5ea545 100644
--- a/test/D/CoreScanner/sconstest-dmd.py
+++ b/test/D/CoreScanner/sconstest-dmd.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/CoreScanner/sconstest-gdc.py b/test/D/CoreScanner/sconstest-gdc.py
index 068f2c4a16..da0dc439a5 100644
--- a/test/D/CoreScanner/sconstest-gdc.py
+++ b/test/D/CoreScanner/sconstest-gdc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/CoreScanner/sconstest-ldc.py b/test/D/CoreScanner/sconstest-ldc.py
index f61efbc6ff..bd8e740039 100644
--- a/test/D/CoreScanner/sconstest-ldc.py
+++ b/test/D/CoreScanner/sconstest-ldc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/DMD.py b/test/D/DMD.py
index 8e09de48a0..c0028a6962 100644
--- a/test/D/DMD.py
+++ b/test/D/DMD.py
@@ -60,9 +60,3 @@
 test.fail_test(not test.stdout() in ["Hello!\n", "Hello!\r\n"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/DMD2.py b/test/D/DMD2.py
index 84ceb513eb..d7b431816e 100644
--- a/test/D/DMD2.py
+++ b/test/D/DMD2.py
@@ -62,9 +62,3 @@
 test.fail_test(not test.stdout() == 'Hello!')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/DMD2_Alt.py b/test/D/DMD2_Alt.py
index 3bd58b4366..8629f50892 100644
--- a/test/D/DMD2_Alt.py
+++ b/test/D/DMD2_Alt.py
@@ -62,9 +62,3 @@
 test.fail_test(not test.stdout() == 'Hello!')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/GDC.py b/test/D/GDC.py
index b73c09cb4b..81f89a535d 100644
--- a/test/D/GDC.py
+++ b/test/D/GDC.py
@@ -55,9 +55,3 @@
 test.fail_test(not test.stdout() == 'Hello!')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/GDC_Alt.py b/test/D/GDC_Alt.py
index 27159eeb92..a9bf6d9c48 100644
--- a/test/D/GDC_Alt.py
+++ b/test/D/GDC_Alt.py
@@ -56,9 +56,3 @@
 test.fail_test(not test.stdout() == 'Hello!')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/Common/arLibIssue.py b/test/D/HSTeoh/Common/arLibIssue.py
index 6ea8cafa6c..f7c096ac11 100644
--- a/test/D/HSTeoh/Common/arLibIssue.py
+++ b/test/D/HSTeoh/Common/arLibIssue.py
@@ -57,9 +57,3 @@ def testForTool(tool):
     test.must_exist(test.workpath('mylib.a' if Base()['PLATFORM'] == 'win32' else 'libmylib.a'))
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/Common/libCompileOptions.py b/test/D/HSTeoh/Common/libCompileOptions.py
index 94616aebea..386c9facc8 100644
--- a/test/D/HSTeoh/Common/libCompileOptions.py
+++ b/test/D/HSTeoh/Common/libCompileOptions.py
@@ -57,9 +57,3 @@ def testForTool(tool):
     test.must_exist(test.workpath('prog'))
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/Common/linkingProblem.py b/test/D/HSTeoh/Common/linkingProblem.py
index 0669695317..3ef647a519 100644
--- a/test/D/HSTeoh/Common/linkingProblem.py
+++ b/test/D/HSTeoh/Common/linkingProblem.py
@@ -58,9 +58,3 @@ def testForTool(tool):
     test.must_exist(test.workpath('prog'))
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
index 5838505a5f..1e1b39bc61 100644
--- a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
+++ b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
@@ -64,9 +64,3 @@ def testForTool(tool):
     test.run(status=2, stdout=None, stderr=result, match=TestSCons.match_re_dotall)
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-arLibIssue_dmd.py b/test/D/HSTeoh/sconstest-arLibIssue_dmd.py
index 0b872b48dd..3e8459a6db 100644
--- a/test/D/HSTeoh/sconstest-arLibIssue_dmd.py
+++ b/test/D/HSTeoh/sconstest-arLibIssue_dmd.py
@@ -29,9 +29,3 @@
 
 from Common.arLibIssue import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-arLibIssue_gdc.py b/test/D/HSTeoh/sconstest-arLibIssue_gdc.py
index 45e1e3632a..5275fd47ab 100644
--- a/test/D/HSTeoh/sconstest-arLibIssue_gdc.py
+++ b/test/D/HSTeoh/sconstest-arLibIssue_gdc.py
@@ -29,9 +29,3 @@
 
 from Common.arLibIssue import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-arLibIssue_ldc.py b/test/D/HSTeoh/sconstest-arLibIssue_ldc.py
index 7960d79a91..b5c4c120ea 100644
--- a/test/D/HSTeoh/sconstest-arLibIssue_ldc.py
+++ b/test/D/HSTeoh/sconstest-arLibIssue_ldc.py
@@ -30,9 +30,3 @@
 from Common.arLibIssue import testForTool
 
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-libCompileOptions_dmd.py b/test/D/HSTeoh/sconstest-libCompileOptions_dmd.py
index 14f2348714..bbb7905ffe 100644
--- a/test/D/HSTeoh/sconstest-libCompileOptions_dmd.py
+++ b/test/D/HSTeoh/sconstest-libCompileOptions_dmd.py
@@ -29,9 +29,3 @@
 
 from Common.libCompileOptions import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-libCompileOptions_gdc.py b/test/D/HSTeoh/sconstest-libCompileOptions_gdc.py
index 7b57546a58..331e752f63 100644
--- a/test/D/HSTeoh/sconstest-libCompileOptions_gdc.py
+++ b/test/D/HSTeoh/sconstest-libCompileOptions_gdc.py
@@ -29,9 +29,3 @@
 
 from Common.libCompileOptions import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-libCompileOptions_ldc.py b/test/D/HSTeoh/sconstest-libCompileOptions_ldc.py
index 743435022f..0f567287b8 100644
--- a/test/D/HSTeoh/sconstest-libCompileOptions_ldc.py
+++ b/test/D/HSTeoh/sconstest-libCompileOptions_ldc.py
@@ -30,9 +30,3 @@
 from Common.libCompileOptions import testForTool
 
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-linkingProblem_dmd.py b/test/D/HSTeoh/sconstest-linkingProblem_dmd.py
index f4bac72fc2..fbd41cbe6f 100644
--- a/test/D/HSTeoh/sconstest-linkingProblem_dmd.py
+++ b/test/D/HSTeoh/sconstest-linkingProblem_dmd.py
@@ -29,9 +29,3 @@
 
 from Common.linkingProblem import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-linkingProblem_gdc.py b/test/D/HSTeoh/sconstest-linkingProblem_gdc.py
index 7346b66498..ea3c235730 100644
--- a/test/D/HSTeoh/sconstest-linkingProblem_gdc.py
+++ b/test/D/HSTeoh/sconstest-linkingProblem_gdc.py
@@ -29,9 +29,3 @@
 
 from Common.linkingProblem import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-linkingProblem_ldc.py b/test/D/HSTeoh/sconstest-linkingProblem_ldc.py
index 72c19e4258..3824ba6546 100644
--- a/test/D/HSTeoh/sconstest-linkingProblem_ldc.py
+++ b/test/D/HSTeoh/sconstest-linkingProblem_ldc.py
@@ -30,9 +30,3 @@
 from Common.linkingProblem import testForTool
 
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_dmd.py b/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_dmd.py
index 976f820757..c0d9201263 100644
--- a/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_dmd.py
+++ b/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_dmd.py
@@ -29,9 +29,3 @@
 
 from Common.singleStringCannotBeMultipleOptions import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py b/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py
index d9aee91638..93a4e8018f 100644
--- a/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py
+++ b/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py
@@ -27,9 +27,3 @@
 
 from Common.singleStringCannotBeMultipleOptions import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_ldc.py b/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_ldc.py
index 6718a8864e..f93a25b4a3 100644
--- a/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_ldc.py
+++ b/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_ldc.py
@@ -29,9 +29,3 @@
 
 from Common.singleStringCannotBeMultipleOptions import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py b/test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py
index 675091c6c4..c4d1d82715 100644
--- a/test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py
+++ b/test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py
@@ -62,9 +62,3 @@ def testForTool(tool):
     test.fail_test(test.stdout() != 'Hello World.\n')
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-dmd.py b/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-dmd.py
index df6ddebd0f..c2fe5ea545 100644
--- a/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-dmd.py
+++ b/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-dmd.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-gdc.py b/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-gdc.py
index 068f2c4a16..da0dc439a5 100644
--- a/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-gdc.py
+++ b/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-gdc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-ldc.py b/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-ldc.py
index f61efbc6ff..bd8e740039 100644
--- a/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-ldc.py
+++ b/test/D/HelloWorld/CompileAndLinkOneStep/sconstest-ldc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py b/test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py
index 675091c6c4..c4d1d82715 100644
--- a/test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py
+++ b/test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py
@@ -62,9 +62,3 @@ def testForTool(tool):
     test.fail_test(test.stdout() != 'Hello World.\n')
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-dmd.py b/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-dmd.py
index df6ddebd0f..c2fe5ea545 100644
--- a/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-dmd.py
+++ b/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-dmd.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-gdc.py b/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-gdc.py
index 43bb8ebd21..14aca15968 100644
--- a/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-gdc.py
+++ b/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-gdc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-ldc.py b/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-ldc.py
index f61efbc6ff..bd8e740039 100644
--- a/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-ldc.py
+++ b/test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-ldc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py b/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py
index b2acb4323c..9d0a4762be 100644
--- a/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py
+++ b/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py
@@ -70,9 +70,3 @@ def testForTool(tool):
         test.must_exist(test.workpath(join('test', 'test1', f)))
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_dmd.py b/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_dmd.py
index e248cb632b..17e8bf9545 100644
--- a/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_dmd.py
+++ b/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_dmd.py
@@ -29,9 +29,3 @@
 
 from Common.correctLinkOptions import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_gdc.py b/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_gdc.py
index baf2921af8..006454cf05 100644
--- a/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_gdc.py
+++ b/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_gdc.py
@@ -29,9 +29,3 @@
 
 from Common.correctLinkOptions import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_ldc.py b/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_ldc.py
index 6c524dfd71..fa0ff5bcef 100644
--- a/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_ldc.py
+++ b/test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_ldc.py
@@ -29,9 +29,3 @@
 
 from Common.correctLinkOptions import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py b/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py
index 19b96b93f5..53b882a4ca 100644
--- a/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py
+++ b/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py
@@ -71,9 +71,3 @@ def testForTool(tool):
         test.must_exist(test.workpath(join('test', 'test1', f)))
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_dmd.py b/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_dmd.py
index 2446a28d04..098de3c74a 100644
--- a/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_dmd.py
+++ b/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_dmd.py
@@ -29,9 +29,3 @@
 
 from Common.correctLinkOptions import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_gdc.py b/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_gdc.py
index baf2921af8..006454cf05 100644
--- a/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_gdc.py
+++ b/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_gdc.py
@@ -29,9 +29,3 @@
 
 from Common.correctLinkOptions import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_ldc.py b/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_ldc.py
index a61a94ba07..3fcad563a6 100644
--- a/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_ldc.py
+++ b/test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_ldc.py
@@ -29,9 +29,3 @@
 
 from Common.correctLinkOptions import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Issues/2994/Common/D_changed_DFLAGS_not_rebuilding.py b/test/D/Issues/2994/Common/D_changed_DFLAGS_not_rebuilding.py
index 66d84c899d..7366075648 100644
--- a/test/D/Issues/2994/Common/D_changed_DFLAGS_not_rebuilding.py
+++ b/test/D/Issues/2994/Common/D_changed_DFLAGS_not_rebuilding.py
@@ -56,9 +56,3 @@ def testForTool(tool):
     test.fail_test('is up to date' in test.stdout())
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/LDC.py b/test/D/LDC.py
index aa242c188a..5b325d8097 100644
--- a/test/D/LDC.py
+++ b/test/D/LDC.py
@@ -62,9 +62,3 @@
 test.fail_test(not test.stdout() == 'Hello!')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/LDC_Alt.py b/test/D/LDC_Alt.py
index bca7dd6477..0aa714ef9b 100644
--- a/test/D/LDC_Alt.py
+++ b/test/D/LDC_Alt.py
@@ -63,9 +63,3 @@
 test.fail_test(not test.stdout() == 'Hello!')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/MixedDAndC/Common/common.py b/test/D/MixedDAndC/Common/common.py
index 2de130477f..7a82a5912e 100644
--- a/test/D/MixedDAndC/Common/common.py
+++ b/test/D/MixedDAndC/Common/common.py
@@ -58,9 +58,3 @@ def testForTool(tool):
     test.run()
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/MixedDAndC/sconstest-dmd.py b/test/D/MixedDAndC/sconstest-dmd.py
index d96c5c30ff..dd89bf6b1c 100644
--- a/test/D/MixedDAndC/sconstest-dmd.py
+++ b/test/D/MixedDAndC/sconstest-dmd.py
@@ -32,16 +32,10 @@
     import TestSCons
     test = TestSCons.TestSCons()
 
-    msg = "Skipping Mixed dmd test until a good way to ensure proper gcc is called." 
+    msg = "Skipping Mixed dmd test until a good way to ensure proper gcc is called."
     "Calling default(system /usr/bin/gcc) gcc yields a surplus of linking errors\n"
     test.skip_test(msg)
 
 
 from Common.common import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/MixedDAndC/sconstest-gdc.py b/test/D/MixedDAndC/sconstest-gdc.py
index 7ac95c0865..2f28c3a0a5 100644
--- a/test/D/MixedDAndC/sconstest-gdc.py
+++ b/test/D/MixedDAndC/sconstest-gdc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/MixedDAndC/sconstest-ldc.py b/test/D/MixedDAndC/sconstest-ldc.py
index f9ab34295e..34c28cdeaa 100644
--- a/test/D/MixedDAndC/sconstest-ldc.py
+++ b/test/D/MixedDAndC/sconstest-ldc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Scanner.py b/test/D/Scanner.py
index b005adfe03..b54f281dd6 100644
--- a/test/D/Scanner.py
+++ b/test/D/Scanner.py
@@ -146,9 +146,3 @@
 test.up_to_date(arguments = arguments)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/SharedObjects/Common/common.py b/test/D/SharedObjects/Common/common.py
index e9611a1d27..db351a9537 100644
--- a/test/D/SharedObjects/Common/common.py
+++ b/test/D/SharedObjects/Common/common.py
@@ -99,9 +99,3 @@ def testForTool(tool):
 
 
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/SharedObjects/sconstest-dmd.py b/test/D/SharedObjects/sconstest-dmd.py
index 7dca880ef2..98cc3b9be5 100644
--- a/test/D/SharedObjects/sconstest-dmd.py
+++ b/test/D/SharedObjects/sconstest-dmd.py
@@ -27,9 +27,3 @@
 
 from Common.common import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/SharedObjects/sconstest-gdc.py b/test/D/SharedObjects/sconstest-gdc.py
index 43bb8ebd21..14aca15968 100644
--- a/test/D/SharedObjects/sconstest-gdc.py
+++ b/test/D/SharedObjects/sconstest-gdc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/SharedObjects/sconstest-ldc.py b/test/D/SharedObjects/sconstest-ldc.py
index f61efbc6ff..bd8e740039 100644
--- a/test/D/SharedObjects/sconstest-ldc.py
+++ b/test/D/SharedObjects/sconstest-ldc.py
@@ -29,9 +29,3 @@
 
 from Common.common import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/di/Common/common.py b/test/D/di/Common/common.py
index 6ca40f91c9..582e2ddf14 100644
--- a/test/D/di/Common/common.py
+++ b/test/D/di/Common/common.py
@@ -70,15 +70,10 @@ def testForTool(tool):
     test.up_to_date("helloWorldMain.o hw")
 
     test.run("-c")
-    
+
     test.must_not_exist('source/helloWorld.o')
     test.must_not_exist('helloWorldMain.o')
     test.must_not_exist('include/helloWorld.di')
     test.must_not_exist('hw')
 
     test.pass_test()
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/di/sconstest-dmd.py b/test/D/di/sconstest-dmd.py
index 84833d7fad..35085c3e78 100644
--- a/test/D/di/sconstest-dmd.py
+++ b/test/D/di/sconstest-dmd.py
@@ -27,9 +27,3 @@
 
 from Common.common import testForTool
 testForTool('dmd')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/di/sconstest-gdc.py b/test/D/di/sconstest-gdc.py
index 611f53f0f1..9785a504fd 100644
--- a/test/D/di/sconstest-gdc.py
+++ b/test/D/di/sconstest-gdc.py
@@ -27,9 +27,3 @@
 
 from Common.common import testForTool
 testForTool('gdc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/di/sconstest-ldc.py b/test/D/di/sconstest-ldc.py
index 06f8941a85..7bdfc3d757 100644
--- a/test/D/di/sconstest-ldc.py
+++ b/test/D/di/sconstest-ldc.py
@@ -27,9 +27,3 @@
 
 from Common.common import testForTool
 testForTool('ldc')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DSUFFIXES.py b/test/DSUFFIXES.py
index 54a506ccb1..2e7dcff433 100644
--- a/test/DSUFFIXES.py
+++ b/test/DSUFFIXES.py
@@ -168,9 +168,3 @@ def do_file(outf, inf):
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/DVIPDF.py b/test/DVIPDF/DVIPDF.py
index 1c017a931a..83c27d96ee 100644
--- a/test/DVIPDF/DVIPDF.py
+++ b/test/DVIPDF/DVIPDF.py
@@ -158,9 +158,3 @@
     test.must_exist(test.workpath('bar.pdf'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/DVIPDFCOM.py b/test/DVIPDF/DVIPDFCOM.py
index ddc42b6004..916d47cac0 100644
--- a/test/DVIPDF/DVIPDFCOM.py
+++ b/test/DVIPDF/DVIPDFCOM.py
@@ -49,9 +49,3 @@
 test.must_match('aaa.pdf', "aaa.dvi\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/DVIPDFCOMSTR.py b/test/DVIPDF/DVIPDFCOMSTR.py
index 7cf221cd30..11023cc37a 100644
--- a/test/DVIPDF/DVIPDFCOMSTR.py
+++ b/test/DVIPDF/DVIPDFCOMSTR.py
@@ -53,9 +53,3 @@
 test.must_match('aaa.pdf', "aaa.dvi\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/DVIPDFFLAGS.py b/test/DVIPDF/DVIPDFFLAGS.py
index 9900cf70fc..36163385b1 100644
--- a/test/DVIPDF/DVIPDFFLAGS.py
+++ b/test/DVIPDF/DVIPDFFLAGS.py
@@ -169,9 +169,3 @@
     test.must_exist(test.workpath('bar.pdf'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/makeindex.py b/test/DVIPDF/makeindex.py
index d9ba59759c..4394303038 100644
--- a/test/DVIPDF/makeindex.py
+++ b/test/DVIPDF/makeindex.py
@@ -79,9 +79,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPS/DVIPS.py b/test/DVIPS/DVIPS.py
index 0e688ae006..674821cf3f 100644
--- a/test/DVIPS/DVIPS.py
+++ b/test/DVIPS/DVIPS.py
@@ -179,9 +179,3 @@
 test.must_exist(test.workpath('bar3.ps'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPS/DVIPSFLAGS.py b/test/DVIPS/DVIPSFLAGS.py
index f2e6ba99b3..175c43f38d 100644
--- a/test/DVIPS/DVIPSFLAGS.py
+++ b/test/DVIPS/DVIPSFLAGS.py
@@ -183,9 +183,3 @@
     test.must_exist(test.workpath('bar3.ps'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPS/PSCOM.py b/test/DVIPS/PSCOM.py
index 1b90736e4e..f648274b86 100644
--- a/test/DVIPS/PSCOM.py
+++ b/test/DVIPS/PSCOM.py
@@ -49,9 +49,3 @@
 test.must_match('aaa.ps', "aaa.dvi\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPS/PSCOMSTR.py b/test/DVIPS/PSCOMSTR.py
index 0d754d24f8..3168c4f2d6 100644
--- a/test/DVIPS/PSCOMSTR.py
+++ b/test/DVIPS/PSCOMSTR.py
@@ -53,9 +53,3 @@
 test.must_match('aaa.ps', "aaa.dvi\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/Environment.py b/test/Decider/Environment.py
index 4a23b5cbca..b5a6eb9aad 100644
--- a/test/Decider/Environment.py
+++ b/test/Decider/Environment.py
@@ -60,9 +60,3 @@ def my_decider(dependency, target, prev_ni, repo_node=None):
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/MD5-timestamp-Repository.py b/test/Decider/MD5-timestamp-Repository.py
index 35e24f4979..04cfa108b8 100644
--- a/test/Decider/MD5-timestamp-Repository.py
+++ b/test/Decider/MD5-timestamp-Repository.py
@@ -75,9 +75,3 @@
 test.up_to_date(chdir='work', arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/MD5-timestamp-explain.py b/test/Decider/MD5-timestamp-explain.py
index 357d92492e..67f5332abc 100644
--- a/test/Decider/MD5-timestamp-explain.py
+++ b/test/Decider/MD5-timestamp-explain.py
@@ -48,9 +48,3 @@
 test.not_up_to_date(arguments = '--debug=explain')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/MD5-timestamp.py b/test/Decider/MD5-timestamp.py
index b8988402b0..3890cb2b18 100644
--- a/test/Decider/MD5-timestamp.py
+++ b/test/Decider/MD5-timestamp.py
@@ -71,9 +71,3 @@
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/MD5-winonly-firstbuild.py b/test/Decider/MD5-winonly-firstbuild.py
index beabce3ae7..d3d026bfb9 100644
--- a/test/Decider/MD5-winonly-firstbuild.py
+++ b/test/Decider/MD5-winonly-firstbuild.py
@@ -50,9 +50,3 @@
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/Node.py b/test/Decider/Node.py
index 0fa9726147..41d8601799 100644
--- a/test/Decider/Node.py
+++ b/test/Decider/Node.py
@@ -60,9 +60,3 @@ def my_decider(dependency, target, prev_ni, repo_node):
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/content-timestamp-symlink.py b/test/Decider/content-timestamp-symlink.py
index 4e0c3b007b..342fa9ba4f 100644
--- a/test/Decider/content-timestamp-symlink.py
+++ b/test/Decider/content-timestamp-symlink.py
@@ -73,9 +73,3 @@
 test.must_match('match2.out', 'match2.in\n', message="match2.out not rebuilt\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/default.py b/test/Decider/default.py
index 78f981e1c3..1b0d1af373 100644
--- a/test/Decider/default.py
+++ b/test/Decider/default.py
@@ -58,9 +58,3 @@ def my_decider(dependency, target, prev_ni, repo_node=None):
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/mixed.py b/test/Decider/mixed.py
index 711bd2bce0..c5d76eed3c 100644
--- a/test/Decider/mixed.py
+++ b/test/Decider/mixed.py
@@ -114,9 +114,3 @@ def node_decider(dependency, target, prev_ni, repo_node=None):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/switch-rebuild.py b/test/Decider/switch-rebuild.py
index 4cd09d6f5e..1235830ed9 100644
--- a/test/Decider/switch-rebuild.py
+++ b/test/Decider/switch-rebuild.py
@@ -87,9 +87,3 @@ def write_SConstruct(test, sig_type):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/timestamp.py b/test/Decider/timestamp.py
index 1fcb9e70d2..1f1e3906db 100644
--- a/test/Decider/timestamp.py
+++ b/test/Decider/timestamp.py
@@ -103,9 +103,3 @@
 test.run(arguments='.', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/unknown.py b/test/Decider/unknown.py
index 9f79da3b4c..f0f5ba8eea 100644
--- a/test/Decider/unknown.py
+++ b/test/Decider/unknown.py
@@ -45,9 +45,3 @@
 test.run(arguments = '.', status = 2, stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Default.py b/test/Default.py
index f3fe533911..74c511cc16 100644
--- a/test/Default.py
+++ b/test/Default.py
@@ -231,9 +231,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Delete.py b/test/Delete.py
index fff8946ddd..5845ca73ae 100644
--- a/test/Delete.py
+++ b/test/Delete.py
@@ -216,9 +216,3 @@ def cat(env, source, target):
 test.must_contain_any_line(test.stderr(), fail_strings)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Depends/Depends.py b/test/Depends/Depends.py
index 3ed9e121c4..f991f429c1 100644
--- a/test/Depends/Depends.py
+++ b/test/Depends/Depends.py
@@ -143,9 +143,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Depends/no-Builder.py b/test/Depends/no-Builder.py
index 7e04bc955f..8520a0ffc1 100644
--- a/test/Depends/no-Builder.py
+++ b/test/Depends/no-Builder.py
@@ -59,9 +59,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Depends/spurious-rebuilds.py b/test/Depends/spurious-rebuilds.py
index f4ad040424..4f4d8a82a1 100644
--- a/test/Depends/spurious-rebuilds.py
+++ b/test/Depends/spurious-rebuilds.py
@@ -31,7 +31,7 @@
 too early for File nodes.
 
 This test verifies that the changed() function works properly, especially
-in connection with auto-generated sources, combined with an explicit Depends().  
+in connection with auto-generated sources, combined with an explicit Depends().
 """
 
 import TestSCons
@@ -65,9 +65,3 @@
 test.up_to_date(arguments = 'all-defuns.obj')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Dir/Dir.py b/test/Dir/Dir.py
index d154873a69..88d22500b8 100644
--- a/test/Dir/Dir.py
+++ b/test/Dir/Dir.py
@@ -79,9 +79,3 @@ def my_mkdir(target=None, source=None, env=None):
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Dir/DriveAbsPath.py b/test/Dir/DriveAbsPath.py
index 5cb675e5a3..cd3ffeec23 100644
--- a/test/Dir/DriveAbsPath.py
+++ b/test/Dir/DriveAbsPath.py
@@ -42,9 +42,3 @@
     test.pass_test()
 else:
     test.skip_test('Skipping Windows-only test.')
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Dir/PyPackageDir/PyPackageDir.py b/test/Dir/PyPackageDir/PyPackageDir.py
index b430ea0fe1..a4f8ca23c3 100644
--- a/test/Dir/PyPackageDir/PyPackageDir.py
+++ b/test/Dir/PyPackageDir/PyPackageDir.py
@@ -46,9 +46,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Dir/mixed-targets.py b/test/Dir/mixed-targets.py
index e4dc349c54..11f8d5e092 100644
--- a/test/Dir/mixed-targets.py
+++ b/test/Dir/mixed-targets.py
@@ -68,9 +68,3 @@ def copier(target, source, env):
 test.must_match(['build', 'dir', 'file3'],  "src/dir/file3\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Dir/source.py b/test/Dir/source.py
index 21516bcdbd..abe5823e5f 100644
--- a/test/Dir/source.py
+++ b/test/Dir/source.py
@@ -172,9 +172,3 @@ def writeTarget(target, source, env):
 test.not_up_to_date(arguments='content.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basedir/htmlchunked/htmlchunked.py b/test/Docbook/basedir/htmlchunked/htmlchunked.py
index 88224874bb..02a7a6dbc6 100644
--- a/test/Docbook/basedir/htmlchunked/htmlchunked.py
+++ b/test/Docbook/basedir/htmlchunked/htmlchunked.py
@@ -52,9 +52,3 @@
 test.must_not_exist(test.workpath('output/index.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basedir/htmlchunked/htmlchunked_cmd.py b/test/Docbook/basedir/htmlchunked/htmlchunked_cmd.py
index f540ffbb66..8df13ad87d 100644
--- a/test/Docbook/basedir/htmlchunked/htmlchunked_cmd.py
+++ b/test/Docbook/basedir/htmlchunked/htmlchunked_cmd.py
@@ -48,9 +48,3 @@
 test.must_not_exist(test.workpath('output/index.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basedir/htmlhelp/htmlhelp.py b/test/Docbook/basedir/htmlhelp/htmlhelp.py
index 171fd57c5c..7866f8b435 100644
--- a/test/Docbook/basedir/htmlhelp/htmlhelp.py
+++ b/test/Docbook/basedir/htmlhelp/htmlhelp.py
@@ -56,9 +56,3 @@
 test.must_not_exist(test.workpath('toc.hhc'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basedir/htmlhelp/htmlhelp_cmd.py b/test/Docbook/basedir/htmlhelp/htmlhelp_cmd.py
index 9d6a4b1614..56c28294f0 100644
--- a/test/Docbook/basedir/htmlhelp/htmlhelp_cmd.py
+++ b/test/Docbook/basedir/htmlhelp/htmlhelp_cmd.py
@@ -52,9 +52,3 @@
 test.must_not_exist(test.workpath('toc.hhc'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basedir/slideshtml/slideshtml.py b/test/Docbook/basedir/slideshtml/slideshtml.py
index 674138d94b..6b82655e8d 100644
--- a/test/Docbook/basedir/slideshtml/slideshtml.py
+++ b/test/Docbook/basedir/slideshtml/slideshtml.py
@@ -53,9 +53,3 @@
 test.must_not_exist(test.workpath('output/index.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basedir/slideshtml/slideshtml_cmd.py b/test/Docbook/basedir/slideshtml/slideshtml_cmd.py
index b395c05eba..42945bbf2b 100644
--- a/test/Docbook/basedir/slideshtml/slideshtml_cmd.py
+++ b/test/Docbook/basedir/slideshtml/slideshtml_cmd.py
@@ -49,9 +49,3 @@
 test.must_not_exist(test.workpath('output/index.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/epub/epub.py b/test/Docbook/basic/epub/epub.py
index ffbde4b0d8..ef9e29d308 100644
--- a/test/Docbook/basic/epub/epub.py
+++ b/test/Docbook/basic/epub/epub.py
@@ -51,9 +51,3 @@
 test.must_not_exist(test.workpath('META-INF'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/epub/epub_cmd.py b/test/Docbook/basic/epub/epub_cmd.py
index e8affe25b8..99afc69f41 100644
--- a/test/Docbook/basic/epub/epub_cmd.py
+++ b/test/Docbook/basic/epub/epub_cmd.py
@@ -50,9 +50,3 @@
 test.must_not_exist(test.workpath('META-INF'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/html/html.py b/test/Docbook/basic/html/html.py
index d445b2d0bb..254041de04 100644
--- a/test/Docbook/basic/html/html.py
+++ b/test/Docbook/basic/html/html.py
@@ -46,9 +46,3 @@
 test.must_not_exist(test.workpath('manual.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/html/html_cmd.py b/test/Docbook/basic/html/html_cmd.py
index 7e9a0a3ce5..c628831971 100644
--- a/test/Docbook/basic/html/html_cmd.py
+++ b/test/Docbook/basic/html/html_cmd.py
@@ -46,9 +46,3 @@
 test.must_not_exist(test.workpath('manual.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/htmlchunked/htmlchunked.py b/test/Docbook/basic/htmlchunked/htmlchunked.py
index 8839915a93..7c7bb1dc8e 100644
--- a/test/Docbook/basic/htmlchunked/htmlchunked.py
+++ b/test/Docbook/basic/htmlchunked/htmlchunked.py
@@ -46,9 +46,3 @@
 test.must_not_exist(test.workpath('index.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/htmlchunked/htmlchunked_cmd.py b/test/Docbook/basic/htmlchunked/htmlchunked_cmd.py
index 9715c0f0ce..8ac765bba0 100644
--- a/test/Docbook/basic/htmlchunked/htmlchunked_cmd.py
+++ b/test/Docbook/basic/htmlchunked/htmlchunked_cmd.py
@@ -46,9 +46,3 @@
 test.must_not_exist(test.workpath('index.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/htmlhelp/htmlhelp.py b/test/Docbook/basic/htmlhelp/htmlhelp.py
index e49586ef2d..7eb2015299 100644
--- a/test/Docbook/basic/htmlhelp/htmlhelp.py
+++ b/test/Docbook/basic/htmlhelp/htmlhelp.py
@@ -50,9 +50,3 @@
 test.must_not_exist(test.workpath('toc.hhc'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/htmlhelp/htmlhelp_cmd.py b/test/Docbook/basic/htmlhelp/htmlhelp_cmd.py
index 6d3fd10da6..d6ee542cbd 100644
--- a/test/Docbook/basic/htmlhelp/htmlhelp_cmd.py
+++ b/test/Docbook/basic/htmlhelp/htmlhelp_cmd.py
@@ -50,9 +50,3 @@
 test.must_not_exist(test.workpath('toc.hhc'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/man/man.py b/test/Docbook/basic/man/man.py
index 843e82b578..c42dc8c8cc 100644
--- a/test/Docbook/basic/man/man.py
+++ b/test/Docbook/basic/man/man.py
@@ -48,9 +48,3 @@
 test.must_not_exist(test.workpath('refdb.sh.8'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/man/man_cmd.py b/test/Docbook/basic/man/man_cmd.py
index 88aebb840d..4cd2a72ec9 100644
--- a/test/Docbook/basic/man/man_cmd.py
+++ b/test/Docbook/basic/man/man_cmd.py
@@ -48,9 +48,3 @@
 test.must_not_exist(test.workpath('refdb.sh.8'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/pdf/pdf.py b/test/Docbook/basic/pdf/pdf.py
index e9bae343cd..67b174ca81 100644
--- a/test/Docbook/basic/pdf/pdf.py
+++ b/test/Docbook/basic/pdf/pdf.py
@@ -52,9 +52,3 @@
 test.must_not_exist(test.workpath('manual.pdf'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/pdf/pdf_cmd.py b/test/Docbook/basic/pdf/pdf_cmd.py
index 59dc4b3f0a..af022806e1 100644
--- a/test/Docbook/basic/pdf/pdf_cmd.py
+++ b/test/Docbook/basic/pdf/pdf_cmd.py
@@ -52,9 +52,3 @@
 test.must_not_exist(test.workpath('manual.pdf'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/slideshtml/slideshtml.py b/test/Docbook/basic/slideshtml/slideshtml.py
index 93592106fa..48f17d2ba9 100644
--- a/test/Docbook/basic/slideshtml/slideshtml.py
+++ b/test/Docbook/basic/slideshtml/slideshtml.py
@@ -53,9 +53,3 @@
 test.must_not_exist(test.workpath('index.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/slideshtml/slideshtml_cmd.py b/test/Docbook/basic/slideshtml/slideshtml_cmd.py
index ff2fde359d..d595963436 100644
--- a/test/Docbook/basic/slideshtml/slideshtml_cmd.py
+++ b/test/Docbook/basic/slideshtml/slideshtml_cmd.py
@@ -49,9 +49,3 @@
 test.must_not_exist(test.workpath('index.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/slidespdf/slidespdf.py b/test/Docbook/basic/slidespdf/slidespdf.py
index 32e2dc4ab9..5b544c4cf5 100644
--- a/test/Docbook/basic/slidespdf/slidespdf.py
+++ b/test/Docbook/basic/slidespdf/slidespdf.py
@@ -58,9 +58,3 @@
 test.must_not_exist(test.workpath('virt.pdf'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/slidespdf/slidespdf_cmd.py b/test/Docbook/basic/slidespdf/slidespdf_cmd.py
index 65e2801d4f..744e1fbb1c 100644
--- a/test/Docbook/basic/slidespdf/slidespdf_cmd.py
+++ b/test/Docbook/basic/slidespdf/slidespdf_cmd.py
@@ -54,9 +54,3 @@
 test.must_not_exist(test.workpath('virt.pdf'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/xinclude/xinclude.py b/test/Docbook/basic/xinclude/xinclude.py
index ea82521422..4e83330a20 100644
--- a/test/Docbook/basic/xinclude/xinclude.py
+++ b/test/Docbook/basic/xinclude/xinclude.py
@@ -48,9 +48,3 @@
 test.must_not_exist(test.workpath('manual_xi.xml'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/xslt/xslt.py b/test/Docbook/basic/xslt/xslt.py
index 1633766fa3..cc41729ad7 100644
--- a/test/Docbook/basic/xslt/xslt.py
+++ b/test/Docbook/basic/xslt/xslt.py
@@ -49,9 +49,3 @@
 test.must_not_exist(test.workpath('out.xml'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/basic/xsltsubdir/xsltsubdir.py b/test/Docbook/basic/xsltsubdir/xsltsubdir.py
index 81aa04217d..fc499135ff 100644
--- a/test/Docbook/basic/xsltsubdir/xsltsubdir.py
+++ b/test/Docbook/basic/xsltsubdir/xsltsubdir.py
@@ -49,9 +49,3 @@
 test.must_not_exist(test.workpath('subdir/out.xml'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/dependencies/xinclude/xinclude.py b/test/Docbook/dependencies/xinclude/xinclude.py
index 07b050d89f..922a472a44 100644
--- a/test/Docbook/dependencies/xinclude/xinclude.py
+++ b/test/Docbook/dependencies/xinclude/xinclude.py
@@ -54,9 +54,3 @@
 test.must_contain(test.workpath('manual_xi.xml'),'<para>This is another text.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/rootname/htmlchunked/htmlchunked.py b/test/Docbook/rootname/htmlchunked/htmlchunked.py
index b40009a496..a9f2bc4f68 100644
--- a/test/Docbook/rootname/htmlchunked/htmlchunked.py
+++ b/test/Docbook/rootname/htmlchunked/htmlchunked.py
@@ -52,9 +52,3 @@
 test.must_not_exist(test.workpath('manual.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/rootname/htmlhelp/htmlhelp.py b/test/Docbook/rootname/htmlhelp/htmlhelp.py
index c6dbcbe13d..39482f5b1a 100644
--- a/test/Docbook/rootname/htmlhelp/htmlhelp.py
+++ b/test/Docbook/rootname/htmlhelp/htmlhelp.py
@@ -56,9 +56,3 @@
 test.must_not_exist(test.workpath('toc.hhc'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Docbook/rootname/slideshtml/slideshtml.py b/test/Docbook/rootname/slideshtml/slideshtml.py
index daa5d8d338..c846a77242 100644
--- a/test/Docbook/rootname/slideshtml/slideshtml.py
+++ b/test/Docbook/rootname/slideshtml/slideshtml.py
@@ -53,9 +53,3 @@
 test.must_not_exist(test.workpath('manual.html'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ENV.py b/test/ENV.py
index 0fc3f093c5..7c329170c2 100644
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -85,9 +85,3 @@
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ESCAPE.py b/test/ESCAPE.py
index 853ab5711f..3313a94e09 100644
--- a/test/ESCAPE.py
+++ b/test/ESCAPE.py
@@ -62,9 +62,3 @@ def my_escape(s):
 test.must_match('file.out', "file.xxx\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/EnsurePythonVersion.py b/test/EnsurePythonVersion.py
index 073ed31eab..70787e3220 100644
--- a/test/EnsurePythonVersion.py
+++ b/test/EnsurePythonVersion.py
@@ -45,9 +45,3 @@
 test.run(status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/EnsureSConsVersion.py b/test/EnsureSConsVersion.py
index 5ac8a285c9..47d5f2f5d7 100644
--- a/test/EnsureSConsVersion.py
+++ b/test/EnsureSConsVersion.py
@@ -160,9 +160,3 @@
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Entry.py b/test/Entry.py
index 3d3255dd35..f142706e0d 100644
--- a/test/Entry.py
+++ b/test/Entry.py
@@ -56,9 +56,3 @@
 """))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Environment.py b/test/Environment.py
index 6810979100..c5b176c9e8 100644
--- a/test/Environment.py
+++ b/test/Environment.py
@@ -59,9 +59,3 @@
 test.run(arguments='foo.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/AttributeError.py b/test/Errors/AttributeError.py
index 09e0d4b73e..2854132b6f 100644
--- a/test/Errors/AttributeError.py
+++ b/test/Errors/AttributeError.py
@@ -45,9 +45,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/Exception.py b/test/Errors/Exception.py
index 9c5f1681a2..031ff23f5a 100644
--- a/test/Errors/Exception.py
+++ b/test/Errors/Exception.py
@@ -74,9 +74,3 @@ def exit(env, target, source):
 test.must_contain_all_lines(test.stdout(), [expect])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/InternalError.py b/test/Errors/InternalError.py
index d37178e192..489f1ad64a 100644
--- a/test/Errors/InternalError.py
+++ b/test/Errors/InternalError.py
@@ -50,9 +50,3 @@
 """, status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/NameError.py b/test/Errors/NameError.py
index 0281253d3d..be69b50714 100644
--- a/test/Errors/NameError.py
+++ b/test/Errors/NameError.py
@@ -45,9 +45,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/SyntaxError.py b/test/Errors/SyntaxError.py
index 2cdebea01b..94a644a78f 100644
--- a/test/Errors/SyntaxError.py
+++ b/test/Errors/SyntaxError.py
@@ -49,9 +49,3 @@
 """, status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/TypeError.py b/test/Errors/TypeError.py
index 802d3dfa20..2c1494bc87 100644
--- a/test/Errors/TypeError.py
+++ b/test/Errors/TypeError.py
@@ -45,9 +45,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/UserError.py b/test/Errors/UserError.py
index 0906a45a4e..54f2f8d408 100644
--- a/test/Errors/UserError.py
+++ b/test/Errors/UserError.py
@@ -48,9 +48,3 @@
          status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/execute-a-directory.py b/test/Errors/execute-a-directory.py
index 8460e2653b..64714fe608 100644
--- a/test/Errors/execute-a-directory.py
+++ b/test/Errors/execute-a-directory.py
@@ -102,9 +102,3 @@
 test.must_contain_any_line(test.stderr(), errs, find=TestSCons.search_re)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/exit-status.py b/test/Errors/exit-status.py
index 554f394fa9..946c1c40f2 100644
--- a/test/Errors/exit-status.py
+++ b/test/Errors/exit-status.py
@@ -52,9 +52,3 @@
 test.run(status=2, stderr="scons: \\*\\*\\* \\[one.out\\] Error 7\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/non-executable-file.py b/test/Errors/non-executable-file.py
index 0363ab7d4b..fddb186ce2 100644
--- a/test/Errors/non-executable-file.py
+++ b/test/Errors/non-executable-file.py
@@ -96,9 +96,3 @@
 test.must_contain_any_line(test.stderr(), errs, find=TestSCons.search_re)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/nonexistent-executable.py b/test/Errors/nonexistent-executable.py
index 9d9e16def9..5f27b820b6 100644
--- a/test/Errors/nonexistent-executable.py
+++ b/test/Errors/nonexistent-executable.py
@@ -75,9 +75,3 @@
 test.must_contain_any_line(test.stderr(), errs, find=TestSCons.search_re)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/permission-denied.py b/test/Errors/permission-denied.py
index 0134803286..05d1e9d501 100644
--- a/test/Errors/permission-denied.py
+++ b/test/Errors/permission-denied.py
@@ -62,9 +62,3 @@
 test.fail_test(test.stderr() not in errs)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/preparation.py b/test/Errors/preparation.py
index 51ca2de9b2..c36a189291 100644
--- a/test/Errors/preparation.py
+++ b/test/Errors/preparation.py
@@ -73,9 +73,3 @@
          stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Execute.py b/test/Execute.py
index 07b88dc832..595a6cad95 100644
--- a/test/Execute.py
+++ b/test/Execute.py
@@ -112,9 +112,3 @@
 test.must_match('m.out', "m.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ExecuteInvalidateCache.py b/test/ExecuteInvalidateCache.py
index f6ed391bf0..291fca23fe 100644
--- a/test/ExecuteInvalidateCache.py
+++ b/test/ExecuteInvalidateCache.py
@@ -107,9 +107,3 @@ def exists
 test.run(arguments = '.', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Exit.py b/test/Exit.py
index 3aa690e44f..a7c19cd3ba 100644
--- a/test/Exit.py
+++ b/test/Exit.py
@@ -150,9 +150,3 @@ def cat(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/File/File-relpath.py b/test/File/File-relpath.py
index 7f7aa3e843..581bfab6a1 100644
--- a/test/File/File-relpath.py
+++ b/test/File/File-relpath.py
@@ -62,9 +62,3 @@
 test.run("-Q", chdir="base", status=0, stdout=expected_stdout + "\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/File/File.py b/test/File/File.py
index bde4449afa..bbcb870b2f 100644
--- a/test/File/File.py
+++ b/test/File/File.py
@@ -74,9 +74,3 @@
 test.run(stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/FindFile.py b/test/FindFile.py
index 53612ae091..ba026043b5 100644
--- a/test/FindFile.py
+++ b/test/FindFile.py
@@ -66,9 +66,3 @@
 test.run(arguments = ".", stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/FindSourceFiles.py b/test/FindSourceFiles.py
index 62b906c13e..995ca16c1b 100644
--- a/test/FindSourceFiles.py
+++ b/test/FindSourceFiles.py
@@ -74,9 +74,3 @@
 test.must_not_exist('foo-1.0/var/foo.c.in')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Flatten.py b/test/Flatten.py
index 7f3acec513..1f65c48307 100644
--- a/test/Flatten.py
+++ b/test/Flatten.py
@@ -76,9 +76,3 @@ def double_backslash(f):
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F03.py b/test/Fortran/F03.py
index 0d4b9461c2..40379810b7 100644
--- a/test/Fortran/F03.py
+++ b/test/Fortran/F03.py
@@ -121,9 +121,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F03COM.py b/test/Fortran/F03COM.py
index aaa790c7f3..060ce97dfb 100644
--- a/test/Fortran/F03COM.py
+++ b/test/Fortran/F03COM.py
@@ -98,9 +98,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F03COMSTR.py b/test/Fortran/F03COMSTR.py
index a3f4e385f3..456292ffb6 100644
--- a/test/Fortran/F03COMSTR.py
+++ b/test/Fortran/F03COMSTR.py
@@ -60,9 +60,3 @@
 test.must_match('test02.obj', "A .F03 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F03FILESUFFIXES.py b/test/Fortran/F03FILESUFFIXES.py
index 49c9c66405..ad371b2468 100644
--- a/test/Fortran/F03FILESUFFIXES.py
+++ b/test/Fortran/F03FILESUFFIXES.py
@@ -77,9 +77,3 @@
 test.must_match('test10' + _exe, "This is a .F03 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F03FILESUFFIXES2.py b/test/Fortran/F03FILESUFFIXES2.py
index 65123416d2..9ae41e0fa8 100644
--- a/test/Fortran/F03FILESUFFIXES2.py
+++ b/test/Fortran/F03FILESUFFIXES2.py
@@ -67,9 +67,3 @@
 test.must_match('test06' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F03FLAGS-live.py b/test/Fortran/F03FLAGS-live.py
index e96e673131..c6f4aaf9fb 100644
--- a/test/Fortran/F03FLAGS-live.py
+++ b/test/Fortran/F03FLAGS-live.py
@@ -87,9 +87,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F03FLAGS.py b/test/Fortran/F03FLAGS.py
index f527d4efad..dfdc29e891 100644
--- a/test/Fortran/F03FLAGS.py
+++ b/test/Fortran/F03FLAGS.py
@@ -87,9 +87,3 @@
 test.must_match('test10' + _exe, " -c -x\nThis is a .F03 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F08.py b/test/Fortran/F08.py
index eb381eefed..5c2d30e2d1 100644
--- a/test/Fortran/F08.py
+++ b/test/Fortran/F08.py
@@ -121,9 +121,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F08COM.py b/test/Fortran/F08COM.py
index f159a53cd2..5e329c70e5 100644
--- a/test/Fortran/F08COM.py
+++ b/test/Fortran/F08COM.py
@@ -84,9 +84,3 @@
     test.must_match('test10' + _exe, "This is a .F08 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F08COMSTR.py b/test/Fortran/F08COMSTR.py
index ba0b50666f..e1c8cfee17 100644
--- a/test/Fortran/F08COMSTR.py
+++ b/test/Fortran/F08COMSTR.py
@@ -60,9 +60,3 @@
 test.must_match('test02.obj', "A .F08 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F08FILESUFFIXES.py b/test/Fortran/F08FILESUFFIXES.py
index 392ff64f46..5006f1eb0c 100644
--- a/test/Fortran/F08FILESUFFIXES.py
+++ b/test/Fortran/F08FILESUFFIXES.py
@@ -77,9 +77,3 @@
 test.must_match('test10' + _exe, "This is a .F08 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F08FILESUFFIXES2.py b/test/Fortran/F08FILESUFFIXES2.py
index babb8e625b..e82c6c8338 100644
--- a/test/Fortran/F08FILESUFFIXES2.py
+++ b/test/Fortran/F08FILESUFFIXES2.py
@@ -67,9 +67,3 @@
 test.must_match('test06' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F08FLAGS-live.py b/test/Fortran/F08FLAGS-live.py
index 20b9dc4f3a..ee412b18e7 100644
--- a/test/Fortran/F08FLAGS-live.py
+++ b/test/Fortran/F08FLAGS-live.py
@@ -85,9 +85,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F08FLAGS.py b/test/Fortran/F08FLAGS.py
index a42e163fe9..ed13f46d03 100644
--- a/test/Fortran/F08FLAGS.py
+++ b/test/Fortran/F08FLAGS.py
@@ -87,9 +87,3 @@
 test.must_match('test10' + _exe, " -c -x\nThis is a .F08 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77.py b/test/Fortran/F77.py
index c43fb3eb36..c64e097dc3 100644
--- a/test/Fortran/F77.py
+++ b/test/Fortran/F77.py
@@ -122,9 +122,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77COM.py b/test/Fortran/F77COM.py
index 6550d9247d..7740c4750d 100644
--- a/test/Fortran/F77COM.py
+++ b/test/Fortran/F77COM.py
@@ -85,9 +85,3 @@
     test.must_match('test10' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77COMSTR.py b/test/Fortran/F77COMSTR.py
index 2bedf73838..be14a88395 100644
--- a/test/Fortran/F77COMSTR.py
+++ b/test/Fortran/F77COMSTR.py
@@ -60,9 +60,3 @@
 test.must_match('test10.obj', "A .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77FILESUFFIXES.py b/test/Fortran/F77FILESUFFIXES.py
index 8c7aec87e8..f67012d53b 100644
--- a/test/Fortran/F77FILESUFFIXES.py
+++ b/test/Fortran/F77FILESUFFIXES.py
@@ -77,9 +77,3 @@
 test.must_match('test10' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77FILESUFFIXES2.py b/test/Fortran/F77FILESUFFIXES2.py
index 86cd931922..eb1c6051fd 100644
--- a/test/Fortran/F77FILESUFFIXES2.py
+++ b/test/Fortran/F77FILESUFFIXES2.py
@@ -61,9 +61,3 @@
 test.must_match('test06' + _exe, "This is a .F95 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77FLAGS-live.py b/test/Fortran/F77FLAGS-live.py
index 14cd8c6bf9..d1e0279082 100644
--- a/test/Fortran/F77FLAGS-live.py
+++ b/test/Fortran/F77FLAGS-live.py
@@ -85,9 +85,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77FLAGS.py b/test/Fortran/F77FLAGS.py
index c3c49d9b45..07c4678051 100644
--- a/test/Fortran/F77FLAGS.py
+++ b/test/Fortran/F77FLAGS.py
@@ -59,9 +59,3 @@
 test.must_match('test10' + _exe, " -c -x\nThis is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77PATH.py b/test/Fortran/F77PATH.py
index cce5f13419..4718fdd85b 100644
--- a/test/Fortran/F77PATH.py
+++ b/test/Fortran/F77PATH.py
@@ -296,9 +296,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90.py b/test/Fortran/F90.py
index 404f8834d9..6e62a6179b 100644
--- a/test/Fortran/F90.py
+++ b/test/Fortran/F90.py
@@ -120,9 +120,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90COM.py b/test/Fortran/F90COM.py
index 180e6b7390..b069206546 100644
--- a/test/Fortran/F90COM.py
+++ b/test/Fortran/F90COM.py
@@ -98,9 +98,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90COMSTR.py b/test/Fortran/F90COMSTR.py
index 4a0ab75dd4..5b10a2b38a 100644
--- a/test/Fortran/F90COMSTR.py
+++ b/test/Fortran/F90COMSTR.py
@@ -59,9 +59,3 @@
 test.must_match('test02.obj', "A .F90 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90FILESUFFIXES.py b/test/Fortran/F90FILESUFFIXES.py
index e376f3c960..5b383d6422 100644
--- a/test/Fortran/F90FILESUFFIXES.py
+++ b/test/Fortran/F90FILESUFFIXES.py
@@ -77,9 +77,3 @@
 test.must_match('test10' + _exe, "This is a .F90 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90FILESUFFIXES2.py b/test/Fortran/F90FILESUFFIXES2.py
index e01425fa25..1746106715 100644
--- a/test/Fortran/F90FILESUFFIXES2.py
+++ b/test/Fortran/F90FILESUFFIXES2.py
@@ -67,9 +67,3 @@
 test.must_match('test06' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90FLAGS-live.py b/test/Fortran/F90FLAGS-live.py
index f5491bca88..e002185768 100644
--- a/test/Fortran/F90FLAGS-live.py
+++ b/test/Fortran/F90FLAGS-live.py
@@ -81,9 +81,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90FLAGS.py b/test/Fortran/F90FLAGS.py
index 5ae1828d6f..7a57a116be 100644
--- a/test/Fortran/F90FLAGS.py
+++ b/test/Fortran/F90FLAGS.py
@@ -87,9 +87,3 @@
 test.must_match('test10' + _exe, " -c -x\nThis is a .F90 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90PATH.py b/test/Fortran/F90PATH.py
index c10e134044..2af54fbea5 100644
--- a/test/Fortran/F90PATH.py
+++ b/test/Fortran/F90PATH.py
@@ -289,9 +289,3 @@
 test.up_to_date(arguments = args)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95.py b/test/Fortran/F95.py
index 7b4c97aa1b..a8d0d930ee 100644
--- a/test/Fortran/F95.py
+++ b/test/Fortran/F95.py
@@ -123,9 +123,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95COM.py b/test/Fortran/F95COM.py
index 2d487701fc..a723df7990 100644
--- a/test/Fortran/F95COM.py
+++ b/test/Fortran/F95COM.py
@@ -96,9 +96,3 @@
     test.must_match('test22' + _exe, "This is a .F95 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95COMSTR.py b/test/Fortran/F95COMSTR.py
index e3bc3ac031..4b1c9e79f9 100644
--- a/test/Fortran/F95COMSTR.py
+++ b/test/Fortran/F95COMSTR.py
@@ -60,9 +60,3 @@
 test.must_match('test02.obj', "A .F95 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95FILESUFFIXES.py b/test/Fortran/F95FILESUFFIXES.py
index 710f838cf2..ddccca2747 100644
--- a/test/Fortran/F95FILESUFFIXES.py
+++ b/test/Fortran/F95FILESUFFIXES.py
@@ -77,9 +77,3 @@
 test.must_match('test10' + _exe, "This is a .F95 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95FILESUFFIXES2.py b/test/Fortran/F95FILESUFFIXES2.py
index 2f8bb17c16..4428cf5193 100644
--- a/test/Fortran/F95FILESUFFIXES2.py
+++ b/test/Fortran/F95FILESUFFIXES2.py
@@ -67,9 +67,3 @@
 test.must_match('test06' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95FLAGS-live.py b/test/Fortran/F95FLAGS-live.py
index 5277df93a5..d47b50e402 100644
--- a/test/Fortran/F95FLAGS-live.py
+++ b/test/Fortran/F95FLAGS-live.py
@@ -87,9 +87,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95FLAGS.py b/test/Fortran/F95FLAGS.py
index 6e61052d01..d7a0cdb35c 100644
--- a/test/Fortran/F95FLAGS.py
+++ b/test/Fortran/F95FLAGS.py
@@ -87,9 +87,3 @@
 test.must_match('test10' + _exe, " -c -x\nThis is a .F95 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRAN.py b/test/Fortran/FORTRAN.py
index 62d7065d46..c127bea648 100644
--- a/test/Fortran/FORTRAN.py
+++ b/test/Fortran/FORTRAN.py
@@ -117,9 +117,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANCOM.py b/test/Fortran/FORTRANCOM.py
index d3d7e7f740..315694d66c 100644
--- a/test/Fortran/FORTRANCOM.py
+++ b/test/Fortran/FORTRANCOM.py
@@ -77,9 +77,3 @@
     test.must_match('test08' + _exe, "This is a .FPP file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANCOMMONFLAGS-live.py b/test/Fortran/FORTRANCOMMONFLAGS-live.py
index 608c2675c7..bbc9e37e12 100644
--- a/test/Fortran/FORTRANCOMMONFLAGS-live.py
+++ b/test/Fortran/FORTRANCOMMONFLAGS-live.py
@@ -82,9 +82,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANCOMMONFLAGS.py b/test/Fortran/FORTRANCOMMONFLAGS.py
index 3d13afbd5a..66dbf670a4 100644
--- a/test/Fortran/FORTRANCOMMONFLAGS.py
+++ b/test/Fortran/FORTRANCOMMONFLAGS.py
@@ -88,9 +88,3 @@
 test.must_match('test10' + _exe, " -c -z -x\nThis is a .F90 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANCOMSTR.py b/test/Fortran/FORTRANCOMSTR.py
index 10f7d3faaa..52dde19006 100644
--- a/test/Fortran/FORTRANCOMSTR.py
+++ b/test/Fortran/FORTRANCOMSTR.py
@@ -84,9 +84,3 @@
 test.must_match('test08.obj', "A .FPP file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANFILESUFFIXES.py b/test/Fortran/FORTRANFILESUFFIXES.py
index e58b971f84..bedde87311 100644
--- a/test/Fortran/FORTRANFILESUFFIXES.py
+++ b/test/Fortran/FORTRANFILESUFFIXES.py
@@ -70,9 +70,3 @@
 test.must_match('test08' + _exe, "This is a .FPP file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANFILESUFFIXES2.py b/test/Fortran/FORTRANFILESUFFIXES2.py
index 15abd2d4c7..59cfebf1a9 100644
--- a/test/Fortran/FORTRANFILESUFFIXES2.py
+++ b/test/Fortran/FORTRANFILESUFFIXES2.py
@@ -66,9 +66,3 @@
 test.must_match('test05' + _exe, "This is a .f77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANFLAGS-live.py b/test/Fortran/FORTRANFLAGS-live.py
index 944ec2ed8e..271d3f948a 100644
--- a/test/Fortran/FORTRANFLAGS-live.py
+++ b/test/Fortran/FORTRANFLAGS-live.py
@@ -88,9 +88,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANFLAGS.py b/test/Fortran/FORTRANFLAGS.py
index 02d5b99505..53cac1b630 100644
--- a/test/Fortran/FORTRANFLAGS.py
+++ b/test/Fortran/FORTRANFLAGS.py
@@ -74,9 +74,3 @@
 test.must_match('test08' + _exe, " -c -x\nThis is a .FPP file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANMODDIR.py b/test/Fortran/FORTRANMODDIR.py
index a0e03af79d..4e986258b0 100644
--- a/test/Fortran/FORTRANMODDIR.py
+++ b/test/Fortran/FORTRANMODDIR.py
@@ -106,9 +106,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANPATH.py b/test/Fortran/FORTRANPATH.py
index f0f8b3ed08..1a9ab320f8 100644
--- a/test/Fortran/FORTRANPATH.py
+++ b/test/Fortran/FORTRANPATH.py
@@ -321,9 +321,3 @@
     test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANSUFFIXES.py b/test/Fortran/FORTRANSUFFIXES.py
index b703c60b56..5d37eef24f 100644
--- a/test/Fortran/FORTRANSUFFIXES.py
+++ b/test/Fortran/FORTRANSUFFIXES.py
@@ -165,9 +165,3 @@ def do_file(outf, inf):
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF03.py b/test/Fortran/SHF03.py
index 1c3fb1b1e0..aa4fdef791 100644
--- a/test/Fortran/SHF03.py
+++ b/test/Fortran/SHF03.py
@@ -116,9 +116,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF03FLAGS-live.py b/test/Fortran/SHF03FLAGS-live.py
index ac17e57eb6..347a8a9f4b 100644
--- a/test/Fortran/SHF03FLAGS-live.py
+++ b/test/Fortran/SHF03FLAGS-live.py
@@ -85,9 +85,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF03FLAGS.py b/test/Fortran/SHF03FLAGS.py
index e9bf6632eb..a9e5ac745a 100644
--- a/test/Fortran/SHF03FLAGS.py
+++ b/test/Fortran/SHF03FLAGS.py
@@ -83,9 +83,3 @@
 test.must_match(obj_ + 'test10' + _obj, " -c -x\nThis is a .F03 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF08.py b/test/Fortran/SHF08.py
index 49a4c476a5..491a287306 100644
--- a/test/Fortran/SHF08.py
+++ b/test/Fortran/SHF08.py
@@ -114,9 +114,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF08FLAGS-live.py b/test/Fortran/SHF08FLAGS-live.py
index 162d736ce2..89e3d99063 100644
--- a/test/Fortran/SHF08FLAGS-live.py
+++ b/test/Fortran/SHF08FLAGS-live.py
@@ -85,9 +85,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF08FLAGS.py b/test/Fortran/SHF08FLAGS.py
index cc9f5370bd..62e58fbfbd 100644
--- a/test/Fortran/SHF08FLAGS.py
+++ b/test/Fortran/SHF08FLAGS.py
@@ -83,9 +83,3 @@
 test.must_match(obj_ + 'test10' + _obj, " -c -x\nThis is a .F08 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77.py b/test/Fortran/SHF77.py
index 4358533fbd..5c3bbc65df 100644
--- a/test/Fortran/SHF77.py
+++ b/test/Fortran/SHF77.py
@@ -115,9 +115,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77COM.py b/test/Fortran/SHF77COM.py
index bd3d1e2cb4..e7482eeb76 100644
--- a/test/Fortran/SHF77COM.py
+++ b/test/Fortran/SHF77COM.py
@@ -82,9 +82,3 @@
     test.must_match(obj_ + 'test10' + _obj, "This is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77COMSTR.py b/test/Fortran/SHF77COMSTR.py
index 37d2edf2a5..3b44ff9731 100644
--- a/test/Fortran/SHF77COMSTR.py
+++ b/test/Fortran/SHF77COMSTR.py
@@ -68,9 +68,3 @@
 test.must_match('test10.shobj', "A .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77FLAGS-live.py b/test/Fortran/SHF77FLAGS-live.py
index b3ec4aa3c7..d8036d37fb 100644
--- a/test/Fortran/SHF77FLAGS-live.py
+++ b/test/Fortran/SHF77FLAGS-live.py
@@ -87,9 +87,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77FLAGS.py b/test/Fortran/SHF77FLAGS.py
index 5b15616943..6bac2eff8d 100644
--- a/test/Fortran/SHF77FLAGS.py
+++ b/test/Fortran/SHF77FLAGS.py
@@ -56,9 +56,3 @@
 test.must_match(obj_ + 'test10' + _obj, " -c -x\nThis is a .F77 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90.py b/test/Fortran/SHF90.py
index 057f98c55e..a0db150ac7 100644
--- a/test/Fortran/SHF90.py
+++ b/test/Fortran/SHF90.py
@@ -117,9 +117,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90COM.py b/test/Fortran/SHF90COM.py
index f66c3470e2..6942f7d20b 100644
--- a/test/Fortran/SHF90COM.py
+++ b/test/Fortran/SHF90COM.py
@@ -93,9 +93,3 @@
     test.must_match(obj_ + 'test22' + _obj, "This is a .F90 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90COMSTR.py b/test/Fortran/SHF90COMSTR.py
index 4ea8ca6efc..5870c1a0e6 100644
--- a/test/Fortran/SHF90COMSTR.py
+++ b/test/Fortran/SHF90COMSTR.py
@@ -59,9 +59,3 @@
 test.must_match('test02.shobj', "A .F90 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90FLAGS-live.py b/test/Fortran/SHF90FLAGS-live.py
index 08a12a3b68..ea70a25136 100644
--- a/test/Fortran/SHF90FLAGS-live.py
+++ b/test/Fortran/SHF90FLAGS-live.py
@@ -85,9 +85,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90FLAGS.py b/test/Fortran/SHF90FLAGS.py
index fbc591f956..0681c99211 100644
--- a/test/Fortran/SHF90FLAGS.py
+++ b/test/Fortran/SHF90FLAGS.py
@@ -83,9 +83,3 @@
 test.must_match(obj_ + 'test10' + _obj, " -c -x\nThis is a .F90 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95.py b/test/Fortran/SHF95.py
index 3b1f4fb9ac..2e57799782 100644
--- a/test/Fortran/SHF95.py
+++ b/test/Fortran/SHF95.py
@@ -116,9 +116,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95COM.py b/test/Fortran/SHF95COM.py
index 85de45e1a8..09e1462536 100644
--- a/test/Fortran/SHF95COM.py
+++ b/test/Fortran/SHF95COM.py
@@ -92,9 +92,3 @@
     test.must_match(obj_ + 'test22' + _obj, "This is a .F95 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95COMSTR.py b/test/Fortran/SHF95COMSTR.py
index 2c1282f22e..02d0870601 100644
--- a/test/Fortran/SHF95COMSTR.py
+++ b/test/Fortran/SHF95COMSTR.py
@@ -60,9 +60,3 @@
 test.must_match('test02.shobj', "A .F95 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95FLAGS-live.py b/test/Fortran/SHF95FLAGS-live.py
index aaaf981cbb..0a92ae1303 100644
--- a/test/Fortran/SHF95FLAGS-live.py
+++ b/test/Fortran/SHF95FLAGS-live.py
@@ -85,9 +85,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95FLAGS.py b/test/Fortran/SHF95FLAGS.py
index f8a80d4b20..189421c6d6 100644
--- a/test/Fortran/SHF95FLAGS.py
+++ b/test/Fortran/SHF95FLAGS.py
@@ -83,9 +83,3 @@
 test.must_match(obj_ + 'test10' + _obj, " -c -x\nThis is a .F95 file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRAN.py b/test/Fortran/SHFORTRAN.py
index a8806e7ff1..80eb448b46 100644
--- a/test/Fortran/SHFORTRAN.py
+++ b/test/Fortran/SHFORTRAN.py
@@ -111,9 +111,3 @@
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRANCOM.py b/test/Fortran/SHFORTRANCOM.py
index 5c42864b4b..0501640c16 100644
--- a/test/Fortran/SHFORTRANCOM.py
+++ b/test/Fortran/SHFORTRANCOM.py
@@ -74,9 +74,3 @@
     test.must_match(obj_ + 'test08' + _obj, "This is a .FPP file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRANCOMSTR.py b/test/Fortran/SHFORTRANCOMSTR.py
index c58920e305..e6c4a77b99 100644
--- a/test/Fortran/SHFORTRANCOMSTR.py
+++ b/test/Fortran/SHFORTRANCOMSTR.py
@@ -84,9 +84,3 @@
 test.must_match('test08.shobj', "A .FPP file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRANFLAGS-live.py b/test/Fortran/SHFORTRANFLAGS-live.py
index a36cfd1afa..3b930f2003 100644
--- a/test/Fortran/SHFORTRANFLAGS-live.py
+++ b/test/Fortran/SHFORTRANFLAGS-live.py
@@ -83,9 +83,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRANFLAGS.py b/test/Fortran/SHFORTRANFLAGS.py
index 0954738aa5..b5f2cfa3ac 100644
--- a/test/Fortran/SHFORTRANFLAGS.py
+++ b/test/Fortran/SHFORTRANFLAGS.py
@@ -69,9 +69,3 @@
 test.must_match(obj_ + 'test08' + _obj, " -c -x\nThis is a .FPP file.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/USE-MODULE-CASEINSENS.py b/test/Fortran/USE-MODULE-CASEINSENS.py
index 4dd115bbbe..0d75e22788 100644
--- a/test/Fortran/USE-MODULE-CASEINSENS.py
+++ b/test/Fortran/USE-MODULE-CASEINSENS.py
@@ -59,9 +59,3 @@
 test.run(arguments = '.', stderr = None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/USE-MODULE.py b/test/Fortran/USE-MODULE.py
index ab76f3d31d..e7f9e38ff5 100644
--- a/test/Fortran/USE-MODULE.py
+++ b/test/Fortran/USE-MODULE.py
@@ -88,9 +88,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/gfortran.py b/test/Fortran/gfortran.py
index 8d9b731294..1c842ce128 100644
--- a/test/Fortran/gfortran.py
+++ b/test/Fortran/gfortran.py
@@ -106,9 +106,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/link-with-cxx.py b/test/Fortran/link-with-cxx.py
index 2f19e828ea..1f1071eb64 100644
--- a/test/Fortran/link-with-cxx.py
+++ b/test/Fortran/link-with-cxx.py
@@ -141,9 +141,3 @@ def copier(target, source, env):
 test.must_match('prog2.exe', "f1.cpp\nf2.f\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/module-subdir.py b/test/Fortran/module-subdir.py
index 0b87aa2f19..665d421e8c 100644
--- a/test/Fortran/module-subdir.py
+++ b/test/Fortran/module-subdir.py
@@ -112,9 +112,3 @@
 test.must_match(['subdir', 'build', 'somemodule.mod'], expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetBuildFailures/option-k.py b/test/GetBuildFailures/option-k.py
index 50ad302980..6cfd6813cd 100644
--- a/test/GetBuildFailures/option-k.py
+++ b/test/GetBuildFailures/option-k.py
@@ -102,9 +102,3 @@ def print_build_failures():
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetBuildFailures/parallel.py b/test/GetBuildFailures/parallel.py
index 9b162d8478..71dd2c70eb 100644
--- a/test/GetBuildFailures/parallel.py
+++ b/test/GetBuildFailures/parallel.py
@@ -134,9 +134,3 @@ def print_build_failures():
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetBuildFailures/serial.py b/test/GetBuildFailures/serial.py
index ab8fbb5946..a78351c82a 100644
--- a/test/GetBuildFailures/serial.py
+++ b/test/GetBuildFailures/serial.py
@@ -229,9 +229,3 @@ def print_build_failures():
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetOption/BadSetOption.py b/test/GetOption/BadSetOption.py
index f408e39022..d2e37e7fa9 100644
--- a/test/GetOption/BadSetOption.py
+++ b/test/GetOption/BadSetOption.py
@@ -55,9 +55,3 @@
     test.must_contain_all(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetOption/GetSetOption.py b/test/GetOption/GetSetOption.py
index 3ab3e7bb6d..e0b2889c0b 100644
--- a/test/GetOption/GetSetOption.py
+++ b/test/GetOption/GetSetOption.py
@@ -51,9 +51,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetOption/help.py b/test/GetOption/help.py
index 4db4bc89e9..e8d453af06 100644
--- a/test/GetOption/help.py
+++ b/test/GetOption/help.py
@@ -50,9 +50,3 @@
 test.fail_test(test.stdout().split('\n')[0] != expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ghostscript/GS.py b/test/Ghostscript/GS.py
index 68f74276fe..ce7c9d2845 100644
--- a/test/Ghostscript/GS.py
+++ b/test/Ghostscript/GS.py
@@ -114,9 +114,3 @@
     test.fail_test(not os.path.exists(test.workpath('bar.pdf')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ghostscript/GSCOM.py b/test/Ghostscript/GSCOM.py
index fd14ad82cc..b63e5632fc 100644
--- a/test/Ghostscript/GSCOM.py
+++ b/test/Ghostscript/GSCOM.py
@@ -49,9 +49,3 @@
 test.must_match('aaa.pdf', "aaa.ps\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ghostscript/GSCOMSTR.py b/test/Ghostscript/GSCOMSTR.py
index fd82bff9ea..c4755dd64c 100644
--- a/test/Ghostscript/GSCOMSTR.py
+++ b/test/Ghostscript/GSCOMSTR.py
@@ -53,9 +53,3 @@
 test.must_match('aaa.pdf', "aaa.ps\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ghostscript/GSFLAGS.py b/test/Ghostscript/GSFLAGS.py
index e1471fa059..aa98868388 100644
--- a/test/Ghostscript/GSFLAGS.py
+++ b/test/Ghostscript/GSFLAGS.py
@@ -104,9 +104,3 @@
     test.fail_test(not os.path.exists(test.workpath('foo.pdf')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/Repository.py b/test/Glob/Repository.py
index b2b6195760..d992de864c 100644
--- a/test/Glob/Repository.py
+++ b/test/Glob/Repository.py
@@ -118,9 +118,3 @@ def cat(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/VariantDir.py b/test/Glob/VariantDir.py
index 3b64848b04..76f50c665c 100644
--- a/test/Glob/VariantDir.py
+++ b/test/Glob/VariantDir.py
@@ -102,9 +102,3 @@ def concatenate(target, source, env):
 test.must_match(['var3', 'sub1', 'fex.out'], "src/sub1/f2.in\nsrc/sub1/f3.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/basic.py b/test/Glob/basic.py
index 53077ba93c..842fc056ba 100644
--- a/test/Glob/basic.py
+++ b/test/Glob/basic.py
@@ -56,9 +56,3 @@ def concatenate(target, source, env):
 test.must_match('f.out', "f1.in\nf2.in\nf3.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/exclude.py b/test/Glob/exclude.py
index 5c909cb186..11167bcf9a 100644
--- a/test/Glob/exclude.py
+++ b/test/Glob/exclude.py
@@ -79,9 +79,3 @@ def concatenate(target, source, env):
 test.must_match('ff.out', "f1.in\nf2.in\nf3.in\nf4.in\nf5.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/glob-libpath.py b/test/Glob/glob-libpath.py
index b688b7ef37..9ac9eb4090 100644
--- a/test/Glob/glob-libpath.py
+++ b/test/Glob/glob-libpath.py
@@ -83,9 +83,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/source.py b/test/Glob/source.py
index 807d2d7de2..9182d3d772 100644
--- a/test/Glob/source.py
+++ b/test/Glob/source.py
@@ -85,9 +85,3 @@ def concatenate(target, source, env):
 test.must_match(['var2', 'f.out'], "src/f6.in\nsrc/f7.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/strings.py b/test/Glob/strings.py
index 76824f00f1..0b44cfe60e 100644
--- a/test/Glob/strings.py
+++ b/test/Glob/strings.py
@@ -69,9 +69,3 @@ def concatenate(target, source, env):
 test.must_match(['var2', 'f.out'], "src/f1.in\nsrc/f2.in\nsrc/f3.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/subdir.py b/test/Glob/subdir.py
index 63135ba08c..7c2762b5e8 100644
--- a/test/Glob/subdir.py
+++ b/test/Glob/subdir.py
@@ -57,9 +57,3 @@ def concatenate(target, source, env):
 test.must_match('f.out', "subdir/file.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/subst.py b/test/Glob/subst.py
index 4b38779fc7..3efc206834 100644
--- a/test/Glob/subst.py
+++ b/test/Glob/subst.py
@@ -57,9 +57,3 @@ def copy(target, source, env):
 test.must_match('f.out', "f1.in\nf2.in\nf3.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/HeaderGen.py b/test/HeaderGen.py
index 10fa68639f..2e2bb58097 100644
--- a/test/HeaderGen.py
+++ b/test/HeaderGen.py
@@ -81,9 +81,3 @@ def gen_a_h(target, source, env):
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/HeaderInstall.py b/test/HeaderInstall.py
index 071a0f43ff..84a6a4a648 100644
--- a/test/HeaderInstall.py
+++ b/test/HeaderInstall.py
@@ -114,9 +114,3 @@
 test.up_to_date(chdir = 'work2', arguments = 'build')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Help.py b/test/Help.py
index 329ac1dd5b..cd8d2fce11 100644
--- a/test/Help.py
+++ b/test/Help.py
@@ -130,9 +130,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/IDL/IDLSUFFIXES.py b/test/IDL/IDLSUFFIXES.py
index 0a9a50c2ed..887bdc3589 100644
--- a/test/IDL/IDLSUFFIXES.py
+++ b/test/IDL/IDLSUFFIXES.py
@@ -63,9 +63,3 @@
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/IDL/MIDLCOM.py b/test/IDL/MIDLCOM.py
index af5ce01eb7..3f9ed31ef2 100644
--- a/test/IDL/MIDLCOM.py
+++ b/test/IDL/MIDLCOM.py
@@ -69,9 +69,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/IDL/MIDLCOMSTR.py b/test/IDL/MIDLCOMSTR.py
index 9e01aa01d8..a12d0e525e 100644
--- a/test/IDL/MIDLCOMSTR.py
+++ b/test/IDL/MIDLCOMSTR.py
@@ -53,9 +53,3 @@
 test.must_match('aaa.tlb', "aaa.idl\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/IDL/midl.py b/test/IDL/midl.py
index 7ada153b9e..8344f9338a 100644
--- a/test/IDL/midl.py
+++ b/test/IDL/midl.py
@@ -84,7 +84,7 @@
 
 #include "resource.h"
 
-class ATL_NO_VTABLE CBarObject : 
+class ATL_NO_VTABLE CBarObject :
         public CComObjectRootEx<CComSingleThreadModel>,
         public CComCoClass<CBarObject, &CLSID_BarObject>,
         public IDispatchImpl<IBarObject, &IID_IBarObject, &LIBID_BARLib>
@@ -284,18 +284,18 @@ class ATL_NO_VTABLE CBarObject :
 
 #ifdef APSTUDIO_INVOKED
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE DISCARDABLE
 BEGIN
     "resource.h\\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#include ""winres.h""\\r\\n"
     "\\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE DISCARDABLE
 BEGIN
     "1 TYPELIB ""bar.tlb""\\r\\n"
     "\\0"
@@ -344,7 +344,7 @@ class ATL_NO_VTABLE CBarObject :
 
 IDR_BAROBJECT           REGISTRY DISCARDABLE    "BarObject.rgs"
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PROJNAME            "bar"
 END
@@ -437,9 +437,3 @@ class ATL_NO_VTABLE CBarObject :
 test.must_not_exist(['build2','bar.exp'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ignore.py b/test/Ignore.py
index 053f785a0e..62acc8b20b 100644
--- a/test/Ignore.py
+++ b/test/Ignore.py
@@ -114,9 +114,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/Clone.py b/test/Install/Clone.py
index c88a078da7..8341e46599 100644
--- a/test/Install/Clone.py
+++ b/test/Install/Clone.py
@@ -67,9 +67,3 @@
 test.must_match(['sub3', 'foo.out'], "foo.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/INSTALLSTR.py b/test/Install/INSTALLSTR.py
index 3ce71bef1c..4dfaf247bc 100644
--- a/test/Install/INSTALLSTR.py
+++ b/test/Install/INSTALLSTR.py
@@ -52,9 +52,3 @@
 test.must_match(['install', 'file'], "file\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/Install-ro.py b/test/Install/Install-ro.py
index aa7e6f3d66..0da0b4458d 100644
--- a/test/Install/Install-ro.py
+++ b/test/Install/Install-ro.py
@@ -36,8 +36,3 @@
 test.run(arguments=["-Q"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
diff --git a/test/Install/Install.py b/test/Install/Install.py
index 8bb9ed719c..e8b5d1ce62 100644
--- a/test/Install/Install.py
+++ b/test/Install/Install.py
@@ -144,9 +144,3 @@ def my_install(dest, source, env):
         test.must_contain_any_line(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/InstallAs.py b/test/Install/InstallAs.py
index 24a9ddced2..3787c2d072 100644
--- a/test/Install/InstallAs.py
+++ b/test/Install/InstallAs.py
@@ -83,9 +83,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/dir-exists.py b/test/Install/dir-exists.py
index 9e9a9b0fd4..35eb12165e 100644
--- a/test/Install/dir-exists.py
+++ b/test/Install/dir-exists.py
@@ -57,9 +57,3 @@
 test.run(arguments=["-Q"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/directories.py b/test/Install/directories.py
index 66182b77cf..926599e7b4 100644
--- a/test/Install/directories.py
+++ b/test/Install/directories.py
@@ -47,7 +47,7 @@
 
 test.write(['work', 'SConstruct'], """\
 DefaultEnvironment(tools=[])
-env = Environment(tools=[]) 
+env = Environment(tools=[])
 
 Install('../outside',  'dir1')
 InstallAs('../outside/d2', 'dir2')
@@ -93,9 +93,3 @@
 test.must_match(test.workpath('outside', 'd4', 'sub', 'f9'),    "work/dir4/sub/f9\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/multi.py b/test/Install/multi.py
index 2d83981323..861cfd25a4 100644
--- a/test/Install/multi.py
+++ b/test/Install/multi.py
@@ -34,7 +34,7 @@
 
 test.write('SConstruct', """
 DefaultEnvironment(tools=[])
-env = Environment(tools=[]) 
+env = Environment(tools=[])
 env.Install('install', 'file1')
 env.Install('install', 'file1')
 """)
@@ -45,9 +45,3 @@
 test.must_match(['install', 'file1'], "file1\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/no-top-relative.py b/test/Install/no-top-relative.py
index efba3657b8..0b1d3b3c45 100644
--- a/test/Install/no-top-relative.py
+++ b/test/Install/no-top-relative.py
@@ -39,7 +39,7 @@
 
 test.write(['SConstruct'], """\
 DefaultEnvironment(tools=[])
-env = Environment(tools=[]) 
+env = Environment(tools=[])
 i = env.Install("#/install", "#/test/#testfile.txt#");
 env.Default(i);
 """)
@@ -51,9 +51,3 @@
 test.must_match(['install', '#testfile.txt#'], "test/#testfile.txt#\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/non-ascii-name.py b/test/Install/non-ascii-name.py
index 59a7406a12..0002f51ee7 100644
--- a/test/Install/non-ascii-name.py
+++ b/test/Install/non-ascii-name.py
@@ -42,9 +42,3 @@
 test.run(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/option--install-sandbox.py b/test/Install/option--install-sandbox.py
index bb64c3464e..73b3b70623 100644
--- a/test/Install/option--install-sandbox.py
+++ b/test/Install/option--install-sandbox.py
@@ -71,9 +71,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/rec-sub-dir.py b/test/Install/rec-sub-dir.py
index 0a11928c37..61c0672114 100644
--- a/test/Install/rec-sub-dir.py
+++ b/test/Install/rec-sub-dir.py
@@ -58,9 +58,3 @@
 test.run(arguments=["-Q"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/tool.py b/test/Install/tool.py
index 0730e37c1a..db7f5bc1f5 100644
--- a/test/Install/tool.py
+++ b/test/Install/tool.py
@@ -49,9 +49,3 @@
 test.must_match('foo.out', "foo.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/wrap-by-attribute.py b/test/Install/wrap-by-attribute.py
index 7cb645b2da..a7133cf8b2 100644
--- a/test/Install/wrap-by-attribute.py
+++ b/test/Install/wrap-by-attribute.py
@@ -110,9 +110,3 @@ def InstallAsWithDestDir(target, source):
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Intel/icpc-link.py b/test/Intel/icpc-link.py
index 58d6efd155..068e0f38d0 100644
--- a/test/Intel/icpc-link.py
+++ b/test/Intel/icpc-link.py
@@ -57,9 +57,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/Alias.py b/test/Interactive/Alias.py
index 2af2c8e1e3..f762966d24 100644
--- a/test/Interactive/Alias.py
+++ b/test/Interactive/Alias.py
@@ -86,9 +86,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/Default-None.py b/test/Interactive/Default-None.py
index a69c49dff3..15fbf94092 100644
--- a/test/Interactive/Default-None.py
+++ b/test/Interactive/Default-None.py
@@ -97,9 +97,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/Default.py b/test/Interactive/Default.py
index 156ae9c9ad..b476343295 100644
--- a/test/Interactive/Default.py
+++ b/test/Interactive/Default.py
@@ -87,9 +87,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/added-include.py b/test/Interactive/added-include.py
index 5d3db93ee1..fd9c9f91b8 100644
--- a/test/Interactive/added-include.py
+++ b/test/Interactive/added-include.py
@@ -115,9 +115,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/basic.py b/test/Interactive/basic.py
index 596e060f8c..80f6993eb6 100644
--- a/test/Interactive/basic.py
+++ b/test/Interactive/basic.py
@@ -85,9 +85,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/cache-debug.py b/test/Interactive/cache-debug.py
index edd66c977f..c3ca54c56c 100644
--- a/test/Interactive/cache-debug.py
+++ b/test/Interactive/cache-debug.py
@@ -119,9 +119,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/cache-disable.py b/test/Interactive/cache-disable.py
index 242fe02c86..141f4bc8e4 100644
--- a/test/Interactive/cache-disable.py
+++ b/test/Interactive/cache-disable.py
@@ -116,9 +116,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/cache-force.py b/test/Interactive/cache-force.py
index fcf2774cb6..6cee617287 100644
--- a/test/Interactive/cache-force.py
+++ b/test/Interactive/cache-force.py
@@ -114,9 +114,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/cache-show.py b/test/Interactive/cache-show.py
index b54694f469..1ad7d2c700 100644
--- a/test/Interactive/cache-show.py
+++ b/test/Interactive/cache-show.py
@@ -116,9 +116,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/clean.py b/test/Interactive/clean.py
index bfd3b62cb2..5807969f86 100644
--- a/test/Interactive/clean.py
+++ b/test/Interactive/clean.py
@@ -106,9 +106,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/configure.py b/test/Interactive/configure.py
index 16bca7985f..7e88d52db6 100644
--- a/test/Interactive/configure.py
+++ b/test/Interactive/configure.py
@@ -189,11 +189,5 @@ def CheckMyCC(context):
 /usr/bin/python3 mycc.py foo.obj foo.cpp
 scons>>> build foo.obj
 scons: `foo.obj' is up to date.
-scons>>>
+scons>>> 
 """
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/exit.py b/test/Interactive/exit.py
index 0c84330354..8ec285f140 100644
--- a/test/Interactive/exit.py
+++ b/test/Interactive/exit.py
@@ -65,9 +65,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/failure.py b/test/Interactive/failure.py
index efb83a394f..670df5ba10 100644
--- a/test/Interactive/failure.py
+++ b/test/Interactive/failure.py
@@ -152,9 +152,3 @@ def fail(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/help.py b/test/Interactive/help.py
index ae43ffaeae..4d56d3bad5 100644
--- a/test/Interactive/help.py
+++ b/test/Interactive/help.py
@@ -83,9 +83,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/implicit-VariantDir.py b/test/Interactive/implicit-VariantDir.py
index 7c9d459f8c..69dc84ca50 100644
--- a/test/Interactive/implicit-VariantDir.py
+++ b/test/Interactive/implicit-VariantDir.py
@@ -140,9 +140,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/issue3029.py b/test/Interactive/issue3029.py
index b229f239ed..cf9367ed09 100644
--- a/test/Interactive/issue3029.py
+++ b/test/Interactive/issue3029.py
@@ -62,9 +62,3 @@
 test.must_exist(test.workpath(lib))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option--Q.py b/test/Interactive/option--Q.py
index 4c6a4b1554..5fb36276f3 100644
--- a/test/Interactive/option--Q.py
+++ b/test/Interactive/option--Q.py
@@ -84,9 +84,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-i.py b/test/Interactive/option-i.py
index d814cb402f..c06085bc73 100644
--- a/test/Interactive/option-i.py
+++ b/test/Interactive/option-i.py
@@ -107,9 +107,3 @@ def error(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-j.py b/test/Interactive/option-j.py
index 1822ec8e16..a48664069e 100644
--- a/test/Interactive/option-j.py
+++ b/test/Interactive/option-j.py
@@ -165,9 +165,3 @@ def _f2_a_out_must_not_be_finished(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-k.py b/test/Interactive/option-k.py
index 2975fedc4f..093dd334a0 100644
--- a/test/Interactive/option-k.py
+++ b/test/Interactive/option-k.py
@@ -109,9 +109,3 @@ def error(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-n.py b/test/Interactive/option-n.py
index b93b5612a7..96b01d911c 100644
--- a/test/Interactive/option-n.py
+++ b/test/Interactive/option-n.py
@@ -80,9 +80,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-s.py b/test/Interactive/option-s.py
index 8765a5dfae..5fdd52f34b 100644
--- a/test/Interactive/option-s.py
+++ b/test/Interactive/option-s.py
@@ -80,9 +80,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/repeat-line.py b/test/Interactive/repeat-line.py
index dd497d88b6..c6dd6fb3dc 100644
--- a/test/Interactive/repeat-line.py
+++ b/test/Interactive/repeat-line.py
@@ -88,9 +88,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/shell.py b/test/Interactive/shell.py
index b9a3adaad4..2b73b03e43 100644
--- a/test/Interactive/shell.py
+++ b/test/Interactive/shell.py
@@ -117,9 +117,3 @@
 test.must_contain_all_lines(test.stdout(), expect_stdout.splitlines(), find=TestSCons.search_re)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/taskmastertrace.py b/test/Interactive/taskmastertrace.py
index cad13b4e31..c7196f6e84 100644
--- a/test/Interactive/taskmastertrace.py
+++ b/test/Interactive/taskmastertrace.py
@@ -112,9 +112,3 @@
 test.finish(scons, stdout = expect_stdout)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/tree.py b/test/Interactive/tree.py
index ede9646e5c..62ac19aedf 100644
--- a/test/Interactive/tree.py
+++ b/test/Interactive/tree.py
@@ -73,9 +73,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/unknown-command.py b/test/Interactive/unknown-command.py
index 94b11136b0..071e696bf8 100644
--- a/test/Interactive/unknown-command.py
+++ b/test/Interactive/unknown-command.py
@@ -67,9 +67,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/variant_dir.py b/test/Interactive/variant_dir.py
index e696c816f6..424fa0116f 100644
--- a/test/Interactive/variant_dir.py
+++ b/test/Interactive/variant_dir.py
@@ -110,9 +110,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/version.py b/test/Interactive/version.py
index 15daad7d10..8f84599cb6 100644
--- a/test/Interactive/version.py
+++ b/test/Interactive/version.py
@@ -45,12 +45,12 @@
 """
 
 expect1 = """\
-scons>>> 
+scons>>>
 scons>>> 
 """
 
 expect2 = """\
-scons>>> 
+scons>>>
 scons>>> 
 """
 
@@ -71,9 +71,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/DerivedSourceTest.py b/test/Java/DerivedSourceTest.py
index adf9d50186..844533c07a 100644
--- a/test/Java/DerivedSourceTest.py
+++ b/test/Java/DerivedSourceTest.py
@@ -123,9 +123,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index 2d67717fe3..10ef8e6e94 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -506,7 +506,7 @@
 test.must_exist(['testdir3', 'fooTest', 'com', 'sub', 'foo', 'Example1.class'])
 test.must_exist(['testdir3', 'fooTest', 'com', 'sub', 'foo', 'Example2.class'])
 test.must_exist(['testdir3', 'fooTest', 'com', 'sub', 'foo', 'Example3.class'])
-# TODO: determine expected behavior with resource files, should they be 
+# TODO: determine expected behavior with resource files, should they be
 #       automatically copied in or specified in seperate commands
 test.must_exist(['testdir3', 'fooTest', 'com', 'sub', 'foo', 'NonJava.txt'])
 
@@ -515,14 +515,8 @@
 test.must_exist(['testdir3', 'barTest', 'com', 'sub', 'bar', 'Example4.class'])
 test.must_exist(['testdir3', 'barTest', 'com', 'sub', 'bar', 'Example5.class'])
 test.must_exist(['testdir3', 'barTest', 'com', 'sub', 'bar', 'Example6.class'])
-# TODO: determine expected behavior with resource files, should they be 
+# TODO: determine expected behavior with resource files, should they be
 #       automatically copied in or specified in seperate commands
 test.must_exist(['testdir3', 'barTest', 'com', 'sub', 'bar', 'NonJava.txt'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JARCHDIR.py b/test/Java/JARCHDIR.py
index c84509bd5d..e349b7aba7 100644
--- a/test/Java/JARCHDIR.py
+++ b/test/Java/JARCHDIR.py
@@ -104,9 +104,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JARCOM.py b/test/Java/JARCOM.py
index 9c3723fdcf..783f791567 100644
--- a/test/Java/JARCOM.py
+++ b/test/Java/JARCOM.py
@@ -53,9 +53,3 @@
 test.must_match('test1.jar', "file1.in\nfile2.in\nfile3.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JARCOMSTR.py b/test/Java/JARCOMSTR.py
index 24ecce6a0c..b690750c22 100644
--- a/test/Java/JARCOMSTR.py
+++ b/test/Java/JARCOMSTR.py
@@ -57,9 +57,3 @@
 test.must_match('test1.jar', "file1.in\nfile2.in\nfile3.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JARFLAGS.py b/test/Java/JARFLAGS.py
index 957464d98d..68ad7082f9 100644
--- a/test/Java/JARFLAGS.py
+++ b/test/Java/JARFLAGS.py
@@ -70,9 +70,3 @@
 test.must_exist('test.jar')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVABOOTCLASSPATH.py b/test/Java/JAVABOOTCLASSPATH.py
index d5ccc09d79..3e22df7cce 100644
--- a/test/Java/JAVABOOTCLASSPATH.py
+++ b/test/Java/JAVABOOTCLASSPATH.py
@@ -87,9 +87,3 @@
 test.run(arguments = '-Q -n .', stdout = expect, match=TestSCons.match_re)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index 2349a05093..13d65d622d 100644
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -71,9 +71,3 @@
     test.must_match('test2.class', "test2.JAVA\nline 3\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVACCOM.py b/test/Java/JAVACCOM.py
index 0329f03424..04040ef673 100644
--- a/test/Java/JAVACCOM.py
+++ b/test/Java/JAVACCOM.py
@@ -56,9 +56,3 @@
                 "file1.java\nfile2.java\nfile3.java\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVACCOMSTR.py b/test/Java/JAVACCOMSTR.py
index 6f508993e7..b7f9f84e75 100644
--- a/test/Java/JAVACCOMSTR.py
+++ b/test/Java/JAVACCOMSTR.py
@@ -67,9 +67,3 @@
                 "file1.java\nfile2.java\nfile3.java\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVACFLAGS.py b/test/Java/JAVACFLAGS.py
index 51bf3f68dd..2a801b09a7 100644
--- a/test/Java/JAVACFLAGS.py
+++ b/test/Java/JAVACFLAGS.py
@@ -61,9 +61,3 @@
 test.must_exist(['classes', 'src', 'Example1.class'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVACLASSPATH.py b/test/Java/JAVACLASSPATH.py
index 48034dd096..d8319b4af3 100644
--- a/test/Java/JAVACLASSPATH.py
+++ b/test/Java/JAVACLASSPATH.py
@@ -102,9 +102,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAH-mock.py b/test/Java/JAVAH-mock.py
index e13e1b08e3..345b7ed4a3 100644
--- a/test/Java/JAVAH-mock.py
+++ b/test/Java/JAVAH-mock.py
@@ -94,9 +94,3 @@
     test.must_match('test2.h', "test2.JAVA\nline 3\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py
index 1ad3933c05..2a6da8648f 100644
--- a/test/Java/JAVAH.py
+++ b/test/Java/JAVAH.py
@@ -257,9 +257,3 @@ class Private {
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAHCOM.py b/test/Java/JAVAHCOM.py
index 0ffc1833fd..fc148a75e7 100644
--- a/test/Java/JAVAHCOM.py
+++ b/test/Java/JAVAHCOM.py
@@ -57,9 +57,3 @@
 test.must_match(['out', 'file3.h'], "file3.class\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAHCOMSTR.py b/test/Java/JAVAHCOMSTR.py
index 18aed44d0b..ec992f7f74 100644
--- a/test/Java/JAVAHCOMSTR.py
+++ b/test/Java/JAVAHCOMSTR.py
@@ -71,9 +71,3 @@
 test.must_match(['out', 'file3.h'], "file3.class\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAPROCESSORPATH.py b/test/Java/JAVAPROCESSORPATH.py
index 2b8f04dc53..a592d6a253 100644
--- a/test/Java/JAVAPROCESSORPATH.py
+++ b/test/Java/JAVAPROCESSORPATH.py
@@ -87,9 +87,3 @@
 test.run(arguments = '-Q -n .', stdout = expect, match=TestSCons.match_re)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVASOURCEPATH.py b/test/Java/JAVASOURCEPATH.py
index f12caa3e21..44c79995e5 100644
--- a/test/Java/JAVASOURCEPATH.py
+++ b/test/Java/JAVASOURCEPATH.py
@@ -69,9 +69,3 @@ class TestBar extends TestFoo {;}
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/Java-1.4.py b/test/Java/Java-1.4.py
index 96e6368d85..89c83b6db9 100644
--- a/test/Java/Java-1.4.py
+++ b/test/Java/Java-1.4.py
@@ -385,9 +385,3 @@ def classes_must_not_exist(dir, expect):
 test.fail_test(failed)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/Java-1.5.py b/test/Java/Java-1.5.py
index 5e6cbd70e7..d1bd1936af 100644
--- a/test/Java/Java-1.5.py
+++ b/test/Java/Java-1.5.py
@@ -381,9 +381,3 @@ def classes_must_not_exist(dir, expect):
 test.fail_test(failed)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/Java-1.6.py b/test/Java/Java-1.6.py
index c759e87b54..1dc74967af 100644
--- a/test/Java/Java-1.6.py
+++ b/test/Java/Java-1.6.py
@@ -137,9 +137,3 @@ def classes_must_not_exist(dir, expect):
 test.fail_test(failed)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/Java-1.8.py b/test/Java/Java-1.8.py
index 4e54208423..55840d23f1 100644
--- a/test/Java/Java-1.8.py
+++ b/test/Java/Java-1.8.py
@@ -141,9 +141,3 @@ def classes_must_not_exist(dir, expect):
 test.fail_test(failed)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index b7e45f4e9e..62ed2baef4 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -330,9 +330,3 @@
     test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/RMICCOM.py b/test/Java/RMICCOM.py
index 53c99c5c13..533dfddc44 100644
--- a/test/Java/RMICCOM.py
+++ b/test/Java/RMICCOM.py
@@ -65,9 +65,3 @@
 test.must_match(out_file3, "file3.class\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/RMICCOMSTR.py b/test/Java/RMICCOMSTR.py
index daee7eee72..5443c025db 100644
--- a/test/Java/RMICCOMSTR.py
+++ b/test/Java/RMICCOMSTR.py
@@ -71,9 +71,3 @@
 test.must_match(out_file3, "file3.class\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/inner-cacheable-live.py b/test/Java/inner-cacheable-live.py
index e0391d2f72..ead7459522 100644
--- a/test/Java/inner-cacheable-live.py
+++ b/test/Java/inner-cacheable-live.py
@@ -69,9 +69,3 @@ class Test { class Inner {} }
 test.run(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/jar_not_in_PATH.py b/test/Java/jar_not_in_PATH.py
index 6794a53fc7..876a4cfd33 100644
--- a/test/Java/jar_not_in_PATH.py
+++ b/test/Java/jar_not_in_PATH.py
@@ -59,9 +59,3 @@
 test.must_exist('test1.jar')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py
index 05ef90d40e..7910c81713 100644
--- a/test/Java/multi-step.py
+++ b/test/Java/multi-step.py
@@ -593,9 +593,3 @@ class SampleTest
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/nested-classes.py b/test/Java/nested-classes.py
index 6f4aff9a14..948e1eee95 100644
--- a/test/Java/nested-classes.py
+++ b/test/Java/nested-classes.py
@@ -39,7 +39,7 @@
 
 # Skip this test as SCons doesn't (currently) predict the generated
 # inner/anonymous class generated .class files generated by gcj
-# and so will always fail 
+# and so will always fail
 if test.javac_is_gcj:
     test.skip_test('Test not valid for gcj (gnu java); skipping test(s).\n')
 
@@ -62,8 +62,8 @@ class Inner { };
     class Foo {
       public int reply ( ) {
         class Bar { };
-        return 1 ; 
-      } 
+        return 1 ;
+      }
     } ;
     testAnon(new Test() { });
   }
@@ -71,17 +71,17 @@ class Bar { };
     class Foo {
       public int reply ( ) {
         class Bar { };
-        return 1 ; 
-      } 
+        return 1 ;
+      }
     } ;
     testAnon(new Test() { });
   }
   public Test (int a, int b) {
     class Foobar {
-      public int reply ( ) { 
+      public int reply ( ) {
         class Bar { };
         return 1 ;
-      } 
+      }
     } ;
     testAnon(new Test() { });
   }
@@ -105,9 +105,3 @@ class Bar { };
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/no-JARCHDIR.py b/test/Java/no-JARCHDIR.py
index 0798b090ad..51cd1cab11 100644
--- a/test/Java/no-JARCHDIR.py
+++ b/test/Java/no-JARCHDIR.py
@@ -87,9 +87,3 @@
 
 test.must_contain_all_lines(test.stdout(), [expect])
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/rmic_not_in_PATH.py b/test/Java/rmic_not_in_PATH.py
index 51aca9cd36..689a6f7e60 100644
--- a/test/Java/rmic_not_in_PATH.py
+++ b/test/Java/rmic_not_in_PATH.py
@@ -60,9 +60,3 @@
 test.must_exist(os.path.join('outdir','test1.class'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/source-files.py b/test/Java/source-files.py
index 23e5ebce50..e1e035900e 100644
--- a/test/Java/source-files.py
+++ b/test/Java/source-files.py
@@ -115,9 +115,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/swig-dependencies.py b/test/Java/swig-dependencies.py
index 3fa563dd44..62f4de334d 100644
--- a/test/Java/swig-dependencies.py
+++ b/test/Java/swig-dependencies.py
@@ -149,9 +149,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/KeyboardInterrupt.py b/test/KeyboardInterrupt.py
index dbe1d14b75..18a1abf9c3 100644
--- a/test/KeyboardInterrupt.py
+++ b/test/KeyboardInterrupt.py
@@ -119,9 +119,3 @@ def runtest(arguments):
     runtest('-j64 --random')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/FLEXFLAGS.py b/test/LEX/FLEXFLAGS.py
index b803ec7380..7dee903bcd 100644
--- a/test/LEX/FLEXFLAGS.py
+++ b/test/LEX/FLEXFLAGS.py
@@ -125,9 +125,3 @@
 test.must_not_exist(test.workpath('sub2', 'tables.t'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/LEX.py b/test/LEX/LEX.py
index 3eb7960b1b..0979425646 100644
--- a/test/LEX/LEX.py
+++ b/test/LEX/LEX.py
@@ -56,9 +56,3 @@
 test.must_match('ddd.m', "ddd.lm\nmylex.py\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/LEXCOM.py b/test/LEX/LEXCOM.py
index d4ed91bc91..7590c0d507 100644
--- a/test/LEX/LEXCOM.py
+++ b/test/LEX/LEXCOM.py
@@ -54,9 +54,3 @@
 test.must_match('bbb.c', "bbb.lex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/LEXCOMSTR.py b/test/LEX/LEXCOMSTR.py
index b888db81e8..de0a96e9ab 100644
--- a/test/LEX/LEXCOMSTR.py
+++ b/test/LEX/LEXCOMSTR.py
@@ -59,9 +59,3 @@
 test.must_match('bbb.c', "bbb.lex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/LEXFLAGS.py b/test/LEX/LEXFLAGS.py
index 9cb16abf19..ac4dc55106 100644
--- a/test/LEX/LEXFLAGS.py
+++ b/test/LEX/LEXFLAGS.py
@@ -60,9 +60,3 @@
 test.must_match(['out', 'aaa.c'], "aaa.l\n%s\n out in\n" % lexflags, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/lex_headerfile.py b/test/LEX/lex_headerfile.py
index 7ff035acad..c12cbccbfe 100644
--- a/test/LEX/lex_headerfile.py
+++ b/test/LEX/lex_headerfile.py
@@ -40,9 +40,3 @@
 test.run(chdir='spaced path', arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/live.py b/test/LEX/live.py
index d223043759..3d4a7be896 100644
--- a/test/LEX/live.py
+++ b/test/LEX/live.py
@@ -82,9 +82,3 @@
 test.run(program=test.workpath('bar'), stdin="b\n", stdout="Bbar.lB\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/live_mingw.py b/test/LEX/live_mingw.py
index 6c865e8765..1ba71fb939 100644
--- a/test/LEX/live_mingw.py
+++ b/test/LEX/live_mingw.py
@@ -102,9 +102,3 @@
 test.must_contain(test.workpath('bar.c'), "unistd.h")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/no_lex.py b/test/LEX/no_lex.py
index 969dd3840f..eeed922816 100644
--- a/test/LEX/no_lex.py
+++ b/test/LEX/no_lex.py
@@ -51,9 +51,3 @@ def Detect(self, progs):
 test.run(arguments='-Q -s', stdout='None\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LDMODULEVERSIONFLAGS.py b/test/LINK/LDMODULEVERSIONFLAGS.py
index 509bde848c..83deb1dbed 100644
--- a/test/LINK/LDMODULEVERSIONFLAGS.py
+++ b/test/LINK/LDMODULEVERSIONFLAGS.py
@@ -61,9 +61,3 @@
     test.run(arguments = ['-c'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LINK.py b/test/LINK/LINK.py
index f278ac0411..c839417c64 100644
--- a/test/LINK/LINK.py
+++ b/test/LINK/LINK.py
@@ -76,9 +76,3 @@
 test.must_match('wrapper.out', "wrapper.py\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LINKCOM.py b/test/LINK/LINKCOM.py
index da12b10f2a..c022f12257 100644
--- a/test/LINK/LINKCOM.py
+++ b/test/LINK/LINKCOM.py
@@ -58,9 +58,3 @@
 test.must_match('test1.exe', "test1.obj\ntest2.obj\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LINKCOMSTR.py b/test/LINK/LINKCOMSTR.py
index 419056cc24..4a911773f1 100644
--- a/test/LINK/LINKCOMSTR.py
+++ b/test/LINK/LINKCOMSTR.py
@@ -79,9 +79,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LINKFLAGS.py b/test/LINK/LINKFLAGS.py
index d3b675ee5e..48e7e34606 100644
--- a/test/LINK/LINKFLAGS.py
+++ b/test/LINK/LINKFLAGS.py
@@ -83,9 +83,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLIBVERSIONFLAGS.py b/test/LINK/SHLIBVERSIONFLAGS.py
index 158e82a391..6caf2cd635 100644
--- a/test/LINK/SHLIBVERSIONFLAGS.py
+++ b/test/LINK/SHLIBVERSIONFLAGS.py
@@ -97,9 +97,3 @@
 test.must_contain_all_lines(test.stderr(), ['Ambiguous library .so naming'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLINK.py b/test/LINK/SHLINK.py
index 26d88faf11..21eafc23fb 100644
--- a/test/LINK/SHLINK.py
+++ b/test/LINK/SHLINK.py
@@ -74,9 +74,3 @@
 test.must_match('wrapper.out', "wrapper.py\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLINKCOM.py b/test/LINK/SHLINKCOM.py
index 9907db5e46..bdea95744c 100644
--- a/test/LINK/SHLINKCOM.py
+++ b/test/LINK/SHLINKCOM.py
@@ -64,9 +64,3 @@
 test.must_match('test3.dll', "test1.c\ntest2.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLINKCOMSTR.py b/test/LINK/SHLINKCOMSTR.py
index 18cfc9b618..febcbc33b9 100644
--- a/test/LINK/SHLINKCOMSTR.py
+++ b/test/LINK/SHLINKCOMSTR.py
@@ -91,9 +91,3 @@
             test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLINKFLAGS.py b/test/LINK/SHLINKFLAGS.py
index a4ae652b46..19e1183ed9 100644
--- a/test/LINK/SHLINKFLAGS.py
+++ b/test/LINK/SHLINKFLAGS.py
@@ -81,9 +81,3 @@
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/VersionedLib-VariantDir.py b/test/LINK/VersionedLib-VariantDir.py
index bc96b80798..ddbad77d4f 100644
--- a/test/LINK/VersionedLib-VariantDir.py
+++ b/test/LINK/VersionedLib-VariantDir.py
@@ -160,9 +160,3 @@
 test.must_exist(['src', 'bin', 'SConscript'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/VersionedLib-j2.py b/test/LINK/VersionedLib-j2.py
index 73f05ca73c..85ebc8cd2b 100644
--- a/test/LINK/VersionedLib-j2.py
+++ b/test/LINK/VersionedLib-j2.py
@@ -139,9 +139,3 @@
 test.must_exist(['SConstruct'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/VersionedLib-subdir.py b/test/LINK/VersionedLib-subdir.py
index 98b8e84148..276187ab07 100644
--- a/test/LINK/VersionedLib-subdir.py
+++ b/test/LINK/VersionedLib-subdir.py
@@ -153,9 +153,3 @@
 test.must_exist(['SConstruct'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/VersionedLib.py b/test/LINK/VersionedLib.py
index 44cd0ee4ff..2881b335e4 100644
--- a/test/LINK/VersionedLib.py
+++ b/test/LINK/VersionedLib.py
@@ -276,9 +276,3 @@
         test.must_not_exist(['defaultenv-installtest', f])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/applelink.py b/test/LINK/applelink.py
index 55e265af06..68944d688d 100644
--- a/test/LINK/applelink.py
+++ b/test/LINK/applelink.py
@@ -150,9 +150,3 @@
         test.run(program='/usr/bin/otool', arguments='-L libfoo.%s.dylib' % SHLIBVERSION, stdout=otool_output, match=TestSCons.match_re_dotall)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBLITERALPREFIX.py b/test/Libs/LIBLITERALPREFIX.py
index ebd32b6ae5..8257d5c9c9 100644
--- a/test/Libs/LIBLITERALPREFIX.py
+++ b/test/Libs/LIBLITERALPREFIX.py
@@ -93,9 +93,3 @@
 test.run(program=test.workpath('prog'), stdout="static libfoo\nprog.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBPATH.py b/test/Libs/LIBPATH.py
index 74e92192bc..e2dc5218ab 100644
--- a/test/Libs/LIBPATH.py
+++ b/test/Libs/LIBPATH.py
@@ -31,7 +31,7 @@
 _exe = TestSCons._exe
 _dll = TestSCons._dll
 dll_ = TestSCons.dll_
-    
+
 test = TestSCons.TestSCons()
 
 test.subdir('lib1', 'lib2')
@@ -162,9 +162,3 @@
 test.run(arguments='.', stderr=TestSCons.noisy_ar, match=TestSCons.match_re_dotall)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBPREFIX.py b/test/Libs/LIBPREFIX.py
index 764fb4e569..a71e967320 100644
--- a/test/Libs/LIBPREFIX.py
+++ b/test/Libs/LIBPREFIX.py
@@ -36,9 +36,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBPREFIXES.py b/test/Libs/LIBPREFIXES.py
index 2bf3c9e205..36a995ac9f 100644
--- a/test/Libs/LIBPREFIXES.py
+++ b/test/Libs/LIBPREFIXES.py
@@ -79,9 +79,3 @@
 test.run(program=test.workpath('prog'), stdout="foo.c\nprog.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBS-LIBPREFIX-exists.py b/test/Libs/LIBS-LIBPREFIX-exists.py
index 814eda9de3..3cb2aba006 100644
--- a/test/Libs/LIBS-LIBPREFIX-exists.py
+++ b/test/Libs/LIBS-LIBPREFIX-exists.py
@@ -122,9 +122,3 @@
          stdout='src/component1/message.c\nsrc/component2/hello.c\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBS.py b/test/Libs/LIBS.py
index f5cef77f4f..b987027436 100644
--- a/test/Libs/LIBS.py
+++ b/test/Libs/LIBS.py
@@ -222,9 +222,3 @@
 test.run(program=foo1_exe, stdout='sub1/bar.c\nsub1/baz.c 2\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBSUFFIX.py b/test/Libs/LIBSUFFIX.py
index 764fb4e569..a71e967320 100644
--- a/test/Libs/LIBSUFFIX.py
+++ b/test/Libs/LIBSUFFIX.py
@@ -36,9 +36,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBSUFFIXES.py b/test/Libs/LIBSUFFIXES.py
index 06e4506ac4..aab039e6b6 100644
--- a/test/Libs/LIBSUFFIXES.py
+++ b/test/Libs/LIBSUFFIXES.py
@@ -79,9 +79,3 @@
 test.run(program=test.workpath('prog'), stdout="foo.c\nprog.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/Library.py b/test/Libs/Library.py
index 04ba37dff1..7b94af25fa 100644
--- a/test/Libs/Library.py
+++ b/test/Libs/Library.py
@@ -165,9 +165,3 @@
          stdout = "nrd\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SHLIBPREFIX.py b/test/Libs/SHLIBPREFIX.py
index c46b5aacc7..2af6a96cc7 100644
--- a/test/Libs/SHLIBPREFIX.py
+++ b/test/Libs/SHLIBPREFIX.py
@@ -51,9 +51,3 @@
 test.fail_test(not os.path.exists(test.workpath('shlib-foo' + _lib)))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SHLIBSUFFIX.py b/test/Libs/SHLIBSUFFIX.py
index 31fe8ba8c7..e2509fabf4 100644
--- a/test/Libs/SHLIBSUFFIX.py
+++ b/test/Libs/SHLIBSUFFIX.py
@@ -51,9 +51,3 @@
 test.fail_test(not os.path.exists(test.workpath(dll_ + 'foo.shlib')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SharedLibrary-update-deps.py b/test/Libs/SharedLibrary-update-deps.py
index f8ab44dd20..3a0335d493 100644
--- a/test/Libs/SharedLibrary-update-deps.py
+++ b/test/Libs/SharedLibrary-update-deps.py
@@ -63,9 +63,3 @@
 test.must_contain_all_lines(test.stdout(), ["is up to date"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py
index b8ae88c74f..5f3fa71cf1 100644
--- a/test/Libs/SharedLibrary.py
+++ b/test/Libs/SharedLibrary.py
@@ -282,9 +282,3 @@
              stdout = "f4.c\nprogbar.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SharedLibraryIxes.py b/test/Libs/SharedLibraryIxes.py
index 55fcd27ee2..8af606f824 100644
--- a/test/Libs/SharedLibraryIxes.py
+++ b/test/Libs/SharedLibraryIxes.py
@@ -290,9 +290,3 @@ def prog(i,
     test.run(program = test.workpath(t[3]), stdout=expected)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LoadableModule.py b/test/LoadableModule.py
index ed4e679105..c99ac3fbde 100644
--- a/test/LoadableModule.py
+++ b/test/LoadableModule.py
@@ -118,9 +118,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/M4/M4.py b/test/M4/M4.py
index 1f5c67931c..82a6f13ea4 100644
--- a/test/M4/M4.py
+++ b/test/M4/M4.py
@@ -92,9 +92,3 @@
 test.must_match('bar', os.linesep.join(["line 1", "bbb", "line 3"]))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/M4/M4COM.py b/test/M4/M4COM.py
index 756cd55ba0..78d686fede 100644
--- a/test/M4/M4COM.py
+++ b/test/M4/M4COM.py
@@ -62,9 +62,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/M4/M4COMSTR.py b/test/M4/M4COMSTR.py
index 106cd1d1c3..cc059a209b 100644
--- a/test/M4/M4COMSTR.py
+++ b/test/M4/M4COMSTR.py
@@ -66,9 +66,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_BATCH-spaces-targetdir.py b/test/MSVC/MSVC_BATCH-spaces-targetdir.py
index 965a9b2cbf..66b71fb25d 100644
--- a/test/MSVC/MSVC_BATCH-spaces-targetdir.py
+++ b/test/MSVC/MSVC_BATCH-spaces-targetdir.py
@@ -33,9 +33,3 @@
 test.dir_fixture('MSVC_BATCH-spaces-fixture')
 test.run(stderr=None)  # it's enough that the build didn't fail
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4
diff --git a/test/MSVC/MSVC_NOTFOUND_POLICY.py b/test/MSVC/MSVC_NOTFOUND_POLICY.py
index df1719cf29..88ff553cc4 100644
--- a/test/MSVC/MSVC_NOTFOUND_POLICY.py
+++ b/test/MSVC/MSVC_NOTFOUND_POLICY.py
@@ -131,9 +131,3 @@
 test.run(arguments='-Q -s', stdout='')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_SCRIPTERROR_POLICY.py b/test/MSVC/MSVC_SCRIPTERROR_POLICY.py
index 5efa753155..0526c7fc0b 100644
--- a/test/MSVC/MSVC_SCRIPTERROR_POLICY.py
+++ b/test/MSVC/MSVC_SCRIPTERROR_POLICY.py
@@ -138,9 +138,3 @@
     test.must_contain_all(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_SDK_VERSION.py b/test/MSVC/MSVC_SDK_VERSION.py
index 0f0e25a65b..214bacf843 100644
--- a/test/MSVC/MSVC_SDK_VERSION.py
+++ b/test/MSVC/MSVC_SDK_VERSION.py
@@ -284,9 +284,3 @@ def version_major_list(version_list):
         test.must_contain_all(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_SPECTRE_LIBS.py b/test/MSVC/MSVC_SPECTRE_LIBS.py
index 4747e4ba42..27774837e4 100644
--- a/test/MSVC/MSVC_SPECTRE_LIBS.py
+++ b/test/MSVC/MSVC_SPECTRE_LIBS.py
@@ -149,9 +149,3 @@
             test.run(arguments='-Q -s', stdout='')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_TOOLSET_VERSION.py b/test/MSVC/MSVC_TOOLSET_VERSION.py
index e43f4d7f80..958726eed5 100644
--- a/test/MSVC/MSVC_TOOLSET_VERSION.py
+++ b/test/MSVC/MSVC_TOOLSET_VERSION.py
@@ -263,9 +263,3 @@ def is_buildseries_known(toolset_version):
         test.must_contain_all(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_USE_SCRIPT.py b/test/MSVC/MSVC_USE_SCRIPT.py
index d6c683ffe5..d3d151c2a0 100644
--- a/test/MSVC/MSVC_USE_SCRIPT.py
+++ b/test/MSVC/MSVC_USE_SCRIPT.py
@@ -43,9 +43,3 @@
 test.must_contain_all(test.stderr(), "Script specified by MSVC_USE_SCRIPT not found")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_USE_SCRIPT_ARGS.py b/test/MSVC/MSVC_USE_SCRIPT_ARGS.py
index 4316078321..74276d3c06 100644
--- a/test/MSVC/MSVC_USE_SCRIPT_ARGS.py
+++ b/test/MSVC/MSVC_USE_SCRIPT_ARGS.py
@@ -40,9 +40,3 @@
 test.must_contain('MSDEBUG_OUTPUT.log', "Calling 'fake_script.bat one two'")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_USE_SETTINGS.py b/test/MSVC/MSVC_USE_SETTINGS.py
index a473862fa3..b51f75f293 100644
--- a/test/MSVC/MSVC_USE_SETTINGS.py
+++ b/test/MSVC/MSVC_USE_SETTINGS.py
@@ -67,9 +67,3 @@
 test.must_contain_all(test.stderr(), "MSVCUseSettingsError: MSVC_USE_SETTINGS type error")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/MSVC_UWP_APP.py b/test/MSVC/MSVC_UWP_APP.py
index fd52fd8f5e..c26b51ea09 100644
--- a/test/MSVC/MSVC_UWP_APP.py
+++ b/test/MSVC/MSVC_UWP_APP.py
@@ -68,11 +68,11 @@
 # By default, 2015 Express supports the store argument only for x86 targets.
 # Using MSVC_SCRIPT_ARGS to set the store argument is not validated and
 # will result in the store paths not found on 64-bit hosts when using the
-# default target architecture. 
+# default target architecture.
 
 # By default, 2015 BTDispatch silently ignores the store argument.
 # Using MSVC_SCRIPT_ARGS to set the store argument is not validated and
-# will result in the store paths not found. 
+# will result in the store paths not found.
 
 re_lib_eq2015exp_1 = re.compile(r'\\vc\\lib\\store', re.IGNORECASE)
 
@@ -251,9 +251,3 @@ def _check_libpath(msvc, output):
                     test.fail_test(message='Expected MSVCArgumentError')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/PCH-source.py b/test/MSVC/PCH-source.py
index 99683171b7..6e2907a6fa 100644
--- a/test/MSVC/PCH-source.py
+++ b/test/MSVC/PCH-source.py
@@ -92,9 +92,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/PCHCOM.py b/test/MSVC/PCHCOM.py
index f3dffec163..f492d65d74 100644
--- a/test/MSVC/PCHCOM.py
+++ b/test/MSVC/PCHCOM.py
@@ -49,9 +49,3 @@
 test.must_match('aaa.pch', "aaa.h\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/PCHCOMSTR.py b/test/MSVC/PCHCOMSTR.py
index f458bbe7e5..d90fa895b1 100644
--- a/test/MSVC/PCHCOMSTR.py
+++ b/test/MSVC/PCHCOMSTR.py
@@ -54,9 +54,3 @@
 test.must_match('aaa.pch', "aaa.h\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/PCHSTOP-errors.py b/test/MSVC/PCHSTOP-errors.py
index 63e26426ed..2525e545e6 100644
--- a/test/MSVC/PCHSTOP-errors.py
+++ b/test/MSVC/PCHSTOP-errors.py
@@ -54,9 +54,3 @@
 test.run(arguments='SET_PCHSTOP=1', status=2, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/RCCOM.py b/test/MSVC/RCCOM.py
index 93833e67b4..8c2251c516 100644
--- a/test/MSVC/RCCOM.py
+++ b/test/MSVC/RCCOM.py
@@ -51,9 +51,3 @@
 test.must_match('aaa.res', "aaa.rc\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/RCCOMSTR.py b/test/MSVC/RCCOMSTR.py
index d064e4c979..a9abaa4d85 100644
--- a/test/MSVC/RCCOMSTR.py
+++ b/test/MSVC/RCCOMSTR.py
@@ -52,9 +52,3 @@
 test.must_match('aaa.res', "aaa.rc\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/TARGET_ARCH.py b/test/MSVC/TARGET_ARCH.py
index f093a425d8..41a48a220b 100644
--- a/test/MSVC/TARGET_ARCH.py
+++ b/test/MSVC/TARGET_ARCH.py
@@ -74,9 +74,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/VSWHERE.py b/test/MSVC/VSWHERE.py
index b38ae5f2da..6734774255 100644
--- a/test/MSVC/VSWHERE.py
+++ b/test/MSVC/VSWHERE.py
@@ -114,9 +114,3 @@
 scons: `.' is up to date.
 scons: done building targets.
 """
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/batch-longlines.py b/test/MSVC/batch-longlines.py
index 0e78fd5ae6..c93defdbe0 100644
--- a/test/MSVC/batch-longlines.py
+++ b/test/MSVC/batch-longlines.py
@@ -51,9 +51,3 @@
 test.must_exist('mylib.dll')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/batch.py b/test/MSVC/batch.py
index 205a1810e4..f3acf74a71 100644
--- a/test/MSVC/batch.py
+++ b/test/MSVC/batch.py
@@ -146,9 +146,3 @@
 """, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/embed-manifest.py b/test/MSVC/embed-manifest.py
index dfef0323e0..2fe4ccf6a0 100644
--- a/test/MSVC/embed-manifest.py
+++ b/test/MSVC/embed-manifest.py
@@ -92,9 +92,3 @@
 test.must_contain('dll-extracted.manifest', '</assembly>', mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/generate-rc.py b/test/MSVC/generate-rc.py
index fbf18e7265..6aea868dfd 100644
--- a/test/MSVC/generate-rc.py
+++ b/test/MSVC/generate-rc.py
@@ -66,9 +66,3 @@ def generate_rc(target, source, env):
 test.must_match('my.res', "fake_rc.py\ngenerate_rc\nmy.in\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/hierarchical.py b/test/MSVC/hierarchical.py
index 0e25b6cda7..6c5d7f0bb7 100644
--- a/test/MSVC/hierarchical.py
+++ b/test/MSVC/hierarchical.py
@@ -79,9 +79,3 @@
 test.must_not_exist(test.workpath('build/StdAfx.obj'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/mssdk.py b/test/MSVC/mssdk.py
index 300e8f7c5f..3f5a63a63e 100644
--- a/test/MSVC/mssdk.py
+++ b/test/MSVC/mssdk.py
@@ -50,9 +50,3 @@
 test.run(stderr=None, stdout=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py
index e81ecea7e8..1b2cd4fe8d 100644
--- a/test/MSVC/msvc.py
+++ b/test/MSVC/msvc.py
@@ -134,9 +134,3 @@
 test.run(program=test.workpath('test.exe'), stdout='2003 test 2\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/msvc_badversion.py b/test/MSVC/msvc_badversion.py
index 4932391408..81ff79df4d 100644
--- a/test/MSVC/msvc_badversion.py
+++ b/test/MSVC/msvc_badversion.py
@@ -69,9 +69,3 @@
 test.run(arguments='-Q -s', status=2, stderr=r"^.* Value specified for MSVC_NOTFOUND_POLICY.+", match=TestSCons.match_re_dotall)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/msvc_cache_force_defaults.py b/test/MSVC/msvc_cache_force_defaults.py
index ad67304d56..cf4d0a0bc0 100644
--- a/test/MSVC/msvc_cache_force_defaults.py
+++ b/test/MSVC/msvc_cache_force_defaults.py
@@ -88,9 +88,3 @@
 test.must_contain_all(cache_arg, expect, find=TestSCons.match_re)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/multiple-pdb.py b/test/MSVC/multiple-pdb.py
index a7126a748f..4fd8505fc6 100644
--- a/test/MSVC/multiple-pdb.py
+++ b/test/MSVC/multiple-pdb.py
@@ -74,9 +74,3 @@
 test.must_exist('test2.pdb')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/no_msvc.py b/test/MSVC/no_msvc.py
index aa9e2b8e57..ea8a25dc4f 100644
--- a/test/MSVC/no_msvc.py
+++ b/test/MSVC/no_msvc.py
@@ -78,9 +78,3 @@ def exists(env):
 test.run(arguments='-Q -s', status=2, stderr=r"^.*MSVCToolsetVersionNotFound.+", match=TestSCons.match_re_dotall)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/pch-basics.py b/test/MSVC/pch-basics.py
index 5bb8ee8128..c14101be1e 100644
--- a/test/MSVC/pch-basics.py
+++ b/test/MSVC/pch-basics.py
@@ -68,9 +68,3 @@
 test.run(arguments='.', stderr=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/pch-spaces-subdir.py b/test/MSVC/pch-spaces-subdir.py
index b0a3a52f0f..e8b1aca751 100644
--- a/test/MSVC/pch-spaces-subdir.py
+++ b/test/MSVC/pch-spaces-subdir.py
@@ -72,9 +72,3 @@
 test.run(arguments='.', stderr=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/pch_gen/pch_gen.py b/test/MSVC/pch_gen/pch_gen.py
index 9490d699cb..dbc371d756 100644
--- a/test/MSVC/pch_gen/pch_gen.py
+++ b/test/MSVC/pch_gen/pch_gen.py
@@ -58,9 +58,3 @@
 test.fail_test(condition = ('/Yuoutput1/StdAfx.h' in test.stdout()), message="Shouldn't have output1/YuStdAfx.h in compile line when PCH is disabled")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/pdb-VariantDir-path.py b/test/MSVC/pdb-VariantDir-path.py
index a37cc0b1ae..b6905dfa3b 100644
--- a/test/MSVC/pdb-VariantDir-path.py
+++ b/test/MSVC/pdb-VariantDir-path.py
@@ -67,9 +67,3 @@
 test.must_exist(['.build', 'test%s.pdb' % _exe])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/pdb-manifest.py b/test/MSVC/pdb-manifest.py
index 10a7ed79ef..58175eede0 100644
--- a/test/MSVC/pdb-manifest.py
+++ b/test/MSVC/pdb-manifest.py
@@ -70,9 +70,3 @@
 test.must_not_exist('staticlib.pdb')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/query_vcbat.py b/test/MSVC/query_vcbat.py
index 28bbd02dc3..0bbeda35da 100644
--- a/test/MSVC/query_vcbat.py
+++ b/test/MSVC/query_vcbat.py
@@ -56,9 +56,3 @@
 
 test.run(stderr=None)
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/CPPPATH-Dirs.py b/test/MSVS/CPPPATH-Dirs.py
index 27a05ba14f..b97dd25780 100644
--- a/test/MSVS/CPPPATH-Dirs.py
+++ b/test/MSVS/CPPPATH-Dirs.py
@@ -84,9 +84,3 @@
 test.must_contain_all_lines(test.stdout(), ['Adding', 'Hello'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/common-prefix.py b/test/MSVS/common-prefix.py
index 070ce0d0e4..e8b47d19fa 100644
--- a/test/MSVS/common-prefix.py
+++ b/test/MSVS/common-prefix.py
@@ -168,9 +168,3 @@
 assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/runfile.py b/test/MSVS/runfile.py
index 08c8f31633..14778e0b64 100644
--- a/test/MSVS/runfile.py
+++ b/test/MSVS/runfile.py
@@ -118,9 +118,3 @@
 assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-10.0-exec.py b/test/MSVS/vs-10.0-exec.py
index cf140a26eb..c830301b32 100644
--- a/test/MSVS/vs-10.0-exec.py
+++ b/test/MSVS/vs-10.0-exec.py
@@ -107,9 +107,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-10.0Exp-exec.py b/test/MSVS/vs-10.0Exp-exec.py
index 87ddf29cea..7c33750674 100644
--- a/test/MSVS/vs-10.0Exp-exec.py
+++ b/test/MSVS/vs-10.0Exp-exec.py
@@ -108,9 +108,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-11.0-exec.py b/test/MSVS/vs-11.0-exec.py
index 27dd79460e..627fb3d7ff 100644
--- a/test/MSVS/vs-11.0-exec.py
+++ b/test/MSVS/vs-11.0-exec.py
@@ -108,9 +108,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-11.0Exp-exec.py b/test/MSVS/vs-11.0Exp-exec.py
index 385a50dfcf..658758d735 100644
--- a/test/MSVS/vs-11.0Exp-exec.py
+++ b/test/MSVS/vs-11.0Exp-exec.py
@@ -62,7 +62,7 @@
 if test.stdout() == "":
     msg = "Visual Studio %s missing cl.exe; skipping test.\n" % msvs_version
     test.skip_test(msg)
-    
+
 exec(test.stdout())
 
 
@@ -108,9 +108,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-14.0-exec.py b/test/MSVS/vs-14.0-exec.py
index 82e2d0aabf..a55a166a14 100644
--- a/test/MSVS/vs-14.0-exec.py
+++ b/test/MSVS/vs-14.0-exec.py
@@ -108,9 +108,3 @@
 test.validate_msvs_file(test.workpath('sub dir', 'foo.vcxproj.user'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-14.0Exp-exec.py b/test/MSVS/vs-14.0Exp-exec.py
index d27d4d5ed4..8347f66283 100644
--- a/test/MSVS/vs-14.0Exp-exec.py
+++ b/test/MSVS/vs-14.0Exp-exec.py
@@ -109,9 +109,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-14.1-exec.py b/test/MSVS/vs-14.1-exec.py
index a473fd2a48..8b93b46f10 100644
--- a/test/MSVS/vs-14.1-exec.py
+++ b/test/MSVS/vs-14.1-exec.py
@@ -108,9 +108,3 @@
 test.validate_msvs_file(test.workpath('sub dir', 'foo.vcxproj.user'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-14.2-exec.py b/test/MSVS/vs-14.2-exec.py
index fef9950ed3..a7406d0cfd 100644
--- a/test/MSVS/vs-14.2-exec.py
+++ b/test/MSVS/vs-14.2-exec.py
@@ -108,9 +108,3 @@
 test.validate_msvs_file(test.workpath('sub dir', 'foo.vcxproj.user'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-14.3-exec.py b/test/MSVS/vs-14.3-exec.py
index 572664499d..6b13407730 100644
--- a/test/MSVS/vs-14.3-exec.py
+++ b/test/MSVS/vs-14.3-exec.py
@@ -108,9 +108,3 @@
 test.validate_msvs_file(test.workpath('sub dir', 'foo.vcxproj.user'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-14.5-exec.py b/test/MSVS/vs-14.5-exec.py
index d108bf8049..72512732e1 100644
--- a/test/MSVS/vs-14.5-exec.py
+++ b/test/MSVS/vs-14.5-exec.py
@@ -108,9 +108,3 @@
 test.validate_msvs_file(test.workpath('sub dir', 'foo.vcxproj.user'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-6.0-clean.py b/test/MSVS/vs-6.0-clean.py
index 3f99d650d3..8362c5e392 100644
--- a/test/MSVS/vs-6.0-clean.py
+++ b/test/MSVS/vs-6.0-clean.py
@@ -100,9 +100,3 @@
 test.must_not_exist(test.workpath('Test.dsw'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-6.0-exec.py b/test/MSVS/vs-6.0-exec.py
index 7cffb48373..2ec3064df0 100644
--- a/test/MSVS/vs-6.0-exec.py
+++ b/test/MSVS/vs-6.0-exec.py
@@ -101,9 +101,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-6.0-files.py b/test/MSVS/vs-6.0-files.py
index adc87d9e86..92adff8bf2 100644
--- a/test/MSVS/vs-6.0-files.py
+++ b/test/MSVS/vs-6.0-files.py
@@ -76,9 +76,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-6.0-variant_dir.py b/test/MSVS/vs-6.0-variant_dir.py
index b5299a8f7c..92bcdf3aa8 100644
--- a/test/MSVS/vs-6.0-variant_dir.py
+++ b/test/MSVS/vs-6.0-variant_dir.py
@@ -81,9 +81,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-clean.py b/test/MSVS/vs-7.0-clean.py
index 627c5addb9..22463b140c 100644
--- a/test/MSVS/vs-7.0-clean.py
+++ b/test/MSVS/vs-7.0-clean.py
@@ -101,9 +101,3 @@
 test.must_not_exist(test.workpath('Test.sln'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-exec.py b/test/MSVS/vs-7.0-exec.py
index 7e81d4e70c..5f8880b2fd 100644
--- a/test/MSVS/vs-7.0-exec.py
+++ b/test/MSVS/vs-7.0-exec.py
@@ -103,9 +103,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py
index 202036ce90..35f867a609 100644
--- a/test/MSVS/vs-7.0-files.py
+++ b/test/MSVS/vs-7.0-files.py
@@ -90,9 +90,3 @@
 assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-scc-files.py b/test/MSVS/vs-7.0-scc-files.py
index 2c5c520e60..b67356a3d2 100644
--- a/test/MSVS/vs-7.0-scc-files.py
+++ b/test/MSVS/vs-7.0-scc-files.py
@@ -110,9 +110,3 @@
 assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-scc-legacy-files.py b/test/MSVS/vs-7.0-scc-legacy-files.py
index 00ce397d45..182b973d13 100644
--- a/test/MSVS/vs-7.0-scc-legacy-files.py
+++ b/test/MSVS/vs-7.0-scc-legacy-files.py
@@ -90,9 +90,3 @@
 assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-variant_dir.py b/test/MSVS/vs-7.0-variant_dir.py
index f83d0abe5e..675932e240 100644
--- a/test/MSVS/vs-7.0-variant_dir.py
+++ b/test/MSVS/vs-7.0-variant_dir.py
@@ -78,9 +78,3 @@
                 mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-clean.py b/test/MSVS/vs-7.1-clean.py
index 403463e0bb..e1000e0d55 100644
--- a/test/MSVS/vs-7.1-clean.py
+++ b/test/MSVS/vs-7.1-clean.py
@@ -108,9 +108,3 @@
 test.must_not_exist(test.workpath('Test.sln'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py
index e7f4203f79..ed27eb2380 100644
--- a/test/MSVS/vs-7.1-exec.py
+++ b/test/MSVS/vs-7.1-exec.py
@@ -103,9 +103,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py
index 9fcea6d5f6..fb627e89d7 100644
--- a/test/MSVS/vs-7.1-files.py
+++ b/test/MSVS/vs-7.1-files.py
@@ -90,9 +90,3 @@
 assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-scc-files.py b/test/MSVS/vs-7.1-scc-files.py
index 4f253e7172..b36bbcb5dc 100644
--- a/test/MSVS/vs-7.1-scc-files.py
+++ b/test/MSVS/vs-7.1-scc-files.py
@@ -110,9 +110,3 @@
 assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-scc-legacy-files.py b/test/MSVS/vs-7.1-scc-legacy-files.py
index 96ec21d67f..1462ca1c21 100644
--- a/test/MSVS/vs-7.1-scc-legacy-files.py
+++ b/test/MSVS/vs-7.1-scc-legacy-files.py
@@ -90,9 +90,3 @@
 assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-variant_dir.py b/test/MSVS/vs-7.1-variant_dir.py
index df337ae41e..0cf44329e4 100644
--- a/test/MSVS/vs-7.1-variant_dir.py
+++ b/test/MSVS/vs-7.1-variant_dir.py
@@ -78,9 +78,3 @@
                 mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-8.0-exec.py b/test/MSVS/vs-8.0-exec.py
index 3a3de05295..9dcc7704c2 100644
--- a/test/MSVS/vs-8.0-exec.py
+++ b/test/MSVS/vs-8.0-exec.py
@@ -108,9 +108,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-8.0Exp-exec.py b/test/MSVS/vs-8.0Exp-exec.py
index a3a83ada8b..890329bb64 100644
--- a/test/MSVS/vs-8.0Exp-exec.py
+++ b/test/MSVS/vs-8.0Exp-exec.py
@@ -108,9 +108,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-9.0-exec.py b/test/MSVS/vs-9.0-exec.py
index e112f7a20f..9196846805 100644
--- a/test/MSVS/vs-9.0-exec.py
+++ b/test/MSVS/vs-9.0-exec.py
@@ -108,9 +108,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-9.0Exp-exec.py b/test/MSVS/vs-9.0Exp-exec.py
index cc95ba9715..13f31a2624 100644
--- a/test/MSVS/vs-9.0Exp-exec.py
+++ b/test/MSVS/vs-9.0Exp-exec.py
@@ -108,9 +108,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-files.py b/test/MSVS/vs-files.py
index 54933565e4..287f580b0f 100644
--- a/test/MSVS/vs-files.py
+++ b/test/MSVS/vs-files.py
@@ -109,9 +109,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-mult-auto-guid.py b/test/MSVS/vs-mult-auto-guid.py
index 412c379ab7..59608bafa6 100644
--- a/test/MSVS/vs-mult-auto-guid.py
+++ b/test/MSVS/vs-mult-auto-guid.py
@@ -158,9 +158,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-mult-auto-vardir-guid.py b/test/MSVS/vs-mult-auto-vardir-guid.py
index 87d233220b..58a1fa2f4b 100644
--- a/test/MSVS/vs-mult-auto-vardir-guid.py
+++ b/test/MSVS/vs-mult-auto-vardir-guid.py
@@ -194,9 +194,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-mult-auto-vardir.py b/test/MSVS/vs-mult-auto-vardir.py
index b4d2109312..b8e4a7b8cb 100644
--- a/test/MSVS/vs-mult-auto-vardir.py
+++ b/test/MSVS/vs-mult-auto-vardir.py
@@ -188,9 +188,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-mult-auto.py b/test/MSVS/vs-mult-auto.py
index 57f1145fd1..0e87aaf5b5 100644
--- a/test/MSVS/vs-mult-auto.py
+++ b/test/MSVS/vs-mult-auto.py
@@ -152,9 +152,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-mult-noauto-vardir.py b/test/MSVS/vs-mult-noauto-vardir.py
index 18aacba887..c6b313db53 100644
--- a/test/MSVS/vs-mult-noauto-vardir.py
+++ b/test/MSVS/vs-mult-noauto-vardir.py
@@ -132,9 +132,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-mult-noauto.py b/test/MSVS/vs-mult-noauto.py
index ab0bb6dc62..1d458f2b77 100644
--- a/test/MSVS/vs-mult-noauto.py
+++ b/test/MSVS/vs-mult-noauto.py
@@ -108,9 +108,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-scc-files.py b/test/MSVS/vs-scc-files.py
index 4e79e274f5..c43d1622e8 100644
--- a/test/MSVS/vs-scc-files.py
+++ b/test/MSVS/vs-scc-files.py
@@ -126,9 +126,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-scc-legacy-files.py b/test/MSVS/vs-scc-legacy-files.py
index 9943d3d7ce..7aae2e77ad 100644
--- a/test/MSVS/vs-scc-legacy-files.py
+++ b/test/MSVS/vs-scc-legacy-files.py
@@ -109,9 +109,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-variant_dir.py b/test/MSVS/vs-variant_dir.py
index 880a36edac..ab1ae9dd75 100644
--- a/test/MSVS/vs-variant_dir.py
+++ b/test/MSVS/vs-variant_dir.py
@@ -85,9 +85,3 @@
 
 if test:
     test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MinGW/MinGWSharedLibrary.py b/test/MinGW/MinGWSharedLibrary.py
index 9dbac50576..87c5a3fc2f 100644
--- a/test/MinGW/MinGWSharedLibrary.py
+++ b/test/MinGW/MinGWSharedLibrary.py
@@ -72,9 +72,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MinGW/RCCOM.py b/test/MinGW/RCCOM.py
index ffd58c8f48..9ce22a4e1a 100644
--- a/test/MinGW/RCCOM.py
+++ b/test/MinGW/RCCOM.py
@@ -56,9 +56,3 @@
 test.must_match('aaa.o', "aaa.rc\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MinGW/RCCOMSTR.py b/test/MinGW/RCCOMSTR.py
index e661577cc4..4ffc23e6b6 100644
--- a/test/MinGW/RCCOMSTR.py
+++ b/test/MinGW/RCCOMSTR.py
@@ -60,9 +60,3 @@
 test.must_match('aaa.o', "aaa.rc\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MinGW/WINDOWS_INSERT_DEF.py b/test/MinGW/WINDOWS_INSERT_DEF.py
index 27e075f393..f84abd2d37 100644
--- a/test/MinGW/WINDOWS_INSERT_DEF.py
+++ b/test/MinGW/WINDOWS_INSERT_DEF.py
@@ -63,9 +63,3 @@
 test.up_to_date(arguments = ".")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MinGW/mingw_uses_comstr_issue_2799.py b/test/MinGW/mingw_uses_comstr_issue_2799.py
index ae34f4098a..ab6dd56454 100644
--- a/test/MinGW/mingw_uses_comstr_issue_2799.py
+++ b/test/MinGW/mingw_uses_comstr_issue_2799.py
@@ -51,9 +51,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Mkdir.py b/test/Mkdir.py
index d177232b66..faf71661ae 100644
--- a/test/Mkdir.py
+++ b/test/Mkdir.py
@@ -184,9 +184,3 @@ def catdir(env, source, target):
 test.run(chdir = 'work3', arguments = '')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Move.py b/test/Move.py
index aca8fa424e..002b6cbfdf 100644
--- a/test/Move.py
+++ b/test/Move.py
@@ -93,9 +93,3 @@ def cat(env, source, target):
 test.must_match('Move-f6.out', "f6.in-Move\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/NoClean.py b/test/NoClean.py
index 1cf95778b3..38bc9395fe 100644
--- a/test/NoClean.py
+++ b/test/NoClean.py
@@ -89,9 +89,3 @@ def action(target, source, env):
 test.must_exist('6.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/NodeOps.py b/test/NodeOps.py
index 8beb2c2012..14b2f4ec96 100644
--- a/test/NodeOps.py
+++ b/test/NodeOps.py
@@ -340,9 +340,3 @@ def cleanup_test():
 cleanup_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Object.py b/test/Object.py
index c07da46cea..ef4f1ba545 100644
--- a/test/Object.py
+++ b/test/Object.py
@@ -116,9 +116,3 @@
 test.run(program = test.workpath('prog3'), stdout = stdout)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/PRINT_CMD_LINE_FUNC.py b/test/PRINT_CMD_LINE_FUNC.py
index faa51ace72..2821d15479 100644
--- a/test/PRINT_CMD_LINE_FUNC.py
+++ b/test/PRINT_CMD_LINE_FUNC.py
@@ -71,9 +71,3 @@ def print_cmd_line(s, target, source, env):
 test.run(arguments = '-Q .')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/duplicate-children.py b/test/Parallel/duplicate-children.py
index fab1e58741..bff2d61e4f 100644
--- a/test/Parallel/duplicate-children.py
+++ b/test/Parallel/duplicate-children.py
@@ -66,9 +66,3 @@
 test.must_match('foobar', "foo.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/duplicate-target.py b/test/Parallel/duplicate-target.py
index e947edc5fb..41d2978aa9 100644
--- a/test/Parallel/duplicate-target.py
+++ b/test/Parallel/duplicate-target.py
@@ -103,9 +103,3 @@ def visit(dirname):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/failed-build/failed-build.py b/test/Parallel/failed-build/failed-build.py
index 95e35206e3..048bd26d10 100644
--- a/test/Parallel/failed-build/failed-build.py
+++ b/test/Parallel/failed-build/failed-build.py
@@ -42,20 +42,20 @@
 # which fails and the second of which succeeds, and then stops processing
 # due to the first build failure - the second build job does not just
 # continue processing tasks.  To try to control the timing, the two
-# task scripts will be managed by a server script which regulates the 
+# task scripts will be managed by a server script which regulates the
 # state of the test.
 #
-# The failure script waits until the server responds that the 
-# copy script has, in fact, gotten started. If we don't wait, then SCons 
-# could detect our script failure early (typically if a high system load 
-# happens to delay SCons' ability to start the next script) and then not 
+# The failure script waits until the server responds that the
+# copy script has, in fact, gotten started. If we don't wait, then SCons
+# could detect our script failure early (typically if a high system load
+# happens to delay SCons' ability to start the next script) and then not
 # start the successful script at all.
 #
-# The successful script waits until the server responds that the 
+# The successful script waits until the server responds that the
 # failure script has finished (the server checks that the task pid does not
-# exist). If we don't wait for that, then SCons could detect our successful 
-# exit first (typically if a high system load happens to delay the failure 
-# script) and start another job before it sees the failure from the first 
+# exist). If we don't wait for that, then SCons could detect our successful
+# exit first (typically if a high system load happens to delay the failure
+# script) and start another job before it sees the failure from the first
 # script.
 #
 # Both scripts are set to bail if they had to wait too long for what
@@ -71,9 +71,3 @@
 test.must_not_exist(test.workpath('f6'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/multiple-parents.py b/test/Parallel/multiple-parents.py
index 3712638d28..568fbfcc9a 100644
--- a/test/Parallel/multiple-parents.py
+++ b/test/Parallel/multiple-parents.py
@@ -269,9 +269,3 @@ def simulate_keyboard_interrupt(target=None, source=None, env=None):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/ref_count.py b/test/Parallel/ref_count.py
index 8a31bf3678..0575870f31 100644
--- a/test/Parallel/ref_count.py
+++ b/test/Parallel/ref_count.py
@@ -150,9 +150,3 @@
 """, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ParseConfig.py b/test/ParseConfig.py
index 109a3a76ce..eb8b3c0e07 100644
--- a/test/ParseConfig.py
+++ b/test/ParseConfig.py
@@ -137,9 +137,3 @@
 test.run(arguments = "-q -Q -f SConstruct4 .", stdout = stdout4)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ParseDepends.py b/test/ParseDepends.py
index b699017ead..728aa1447d 100644
--- a/test/ParseDepends.py
+++ b/test/ParseDepends.py
@@ -154,9 +154,3 @@
 test.must_contain_all_lines(test.stderr(), ["No such file or directory"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/PharLap.py b/test/PharLap.py
index 0a541518fd..32cd03a6e1 100644
--- a/test/PharLap.py
+++ b/test/PharLap.py
@@ -42,7 +42,7 @@
 
 # From the Phar Lap minasm example program...
 test.write("minasm.asm", r"""
-; 
+;
 ; MINASM.ASM - A minimal assembly language program which runs
 ;       under ToolSuite.  You can use this program as a framework
 ;       for large assembly language programs.
@@ -226,16 +226,16 @@
 __p_start proc near
         pushad				; save initial regs
         push	es				;
-        call	__pl_unpackrom		; Call the unpacker 
+        call	__pl_unpackrom		; Call the unpacker
         cld				; Clear direction flag
 
-        lea 	eax,__p_SEG__bss_END	; load end address and 
+        lea 	eax,__p_SEG__bss_END	; load end address and
         lea	ebx,__p_SEG__bss_BEGIN	; subtract start to get size
         sub 	eax,ebx
         mov 	ecx,eax			; This is size
         inc	ecx
         lea	edi,__p_SEG__bss_BEGIN	; Zero from start address
-        mov 	al,0			;Zero out BSS and C_COMMON	
+        mov 	al,0			;Zero out BSS and C_COMMON
         rep     stosb
 
         pop	es			; restore initial regs
@@ -308,9 +308,3 @@
 test.fail_test(oldtime == os.path.getmtime(test.workpath('minasm.exe')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Platform.py b/test/Platform.py
index 924dbc758c..9d2e46edcc 100644
--- a/test/Platform.py
+++ b/test/Platform.py
@@ -67,9 +67,3 @@
 test.run(arguments = ".", stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Precious.py b/test/Precious.py
index 8c3dd4aab0..76aa2a46d0 100644
--- a/test/Precious.py
+++ b/test/Precious.py
@@ -118,9 +118,3 @@
 test.fail_test(os.path.exists(test.workpath('subdir', 'f7.out')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Program-j.py b/test/Program-j.py
index 9e0190f6d5..62bbf3c51c 100644
--- a/test/Program-j.py
+++ b/test/Program-j.py
@@ -105,9 +105,3 @@
 test.run(program = test.workpath('f4'), stdout = "f4.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Program.py b/test/Program.py
index d977befb1a..f442b607e4 100644
--- a/test/Program.py
+++ b/test/Program.py
@@ -360,9 +360,3 @@
 test.fail_test(not (oldtime5 == os.path.getmtime(foo5)))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/TARGET.py b/test/Progress/TARGET.py
index 9535390bb3..06ddfb9975 100644
--- a/test/Progress/TARGET.py
+++ b/test/Progress/TARGET.py
@@ -59,9 +59,3 @@
 test.run(arguments = '-Q .', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/dots.py b/test/Progress/dots.py
index e31ec5628d..23b3e72820 100644
--- a/test/Progress/dots.py
+++ b/test/Progress/dots.py
@@ -58,9 +58,3 @@
 test.run(arguments = '-Q .', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/file.py b/test/Progress/file.py
index 391f1b4a2d..2178a8843e 100644
--- a/test/Progress/file.py
+++ b/test/Progress/file.py
@@ -85,9 +85,3 @@ def close_it():
 test.must_match('progress.out', expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/function.py b/test/Progress/function.py
index 9998008f8e..2fcb671018 100644
--- a/test/Progress/function.py
+++ b/test/Progress/function.py
@@ -73,9 +73,3 @@ def my_progress_function(node, *args, **kw):
 test.run(arguments = '-Q .', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/interval.py b/test/Progress/interval.py
index 2b9923889c..767bf2072a 100644
--- a/test/Progress/interval.py
+++ b/test/Progress/interval.py
@@ -66,9 +66,3 @@
 test.run(arguments = '-Q .', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/multi-target.py b/test/Progress/multi-target.py
index f25bce14e0..3a9be52cf3 100644
--- a/test/Progress/multi-target.py
+++ b/test/Progress/multi-target.py
@@ -39,9 +39,3 @@
 test.must_contain_exactly_lines(test.stdout(), ['out1.txt', 'out2.txt'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
\ No newline at end of file
diff --git a/test/Progress/object.py b/test/Progress/object.py
index 25c53cf851..4dad1a10d9 100644
--- a/test/Progress/object.py
+++ b/test/Progress/object.py
@@ -76,9 +76,3 @@ def __call__(self, node, *args, **kw):
 test.run(arguments = '-Q .', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/spinner.py b/test/Progress/spinner.py
index f9be6e9e58..acec03335e 100644
--- a/test/Progress/spinner.py
+++ b/test/Progress/spinner.py
@@ -60,9 +60,3 @@
 test.run(arguments = '-Q .', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Pseudo.py b/test/Pseudo.py
index ec953f7b2a..7eb14569b1 100644
--- a/test/Pseudo.py
+++ b/test/Pseudo.py
@@ -84,9 +84,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/CPPPATH-appended.py b/test/QT/qt3/CPPPATH-appended.py
index ee1808fafe..99e2a0a2f6 100644
--- a/test/QT/qt3/CPPPATH-appended.py
+++ b/test/QT/qt3/CPPPATH-appended.py
@@ -72,9 +72,3 @@
 test.run(arguments='--warn=no-tool-qt-deprecated ' + aaa_exe)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/CPPPATH.py b/test/QT/qt3/CPPPATH.py
index b56efad448..e58e6d019d 100644
--- a/test/QT/qt3/CPPPATH.py
+++ b/test/QT/qt3/CPPPATH.py
@@ -62,9 +62,3 @@
 test.run(arguments='--warn=no-tool-qt-deprecated ' + aaa_exe)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/QTFLAGS.py b/test/QT/qt3/QTFLAGS.py
index ee2a542639..9f50803bf7 100644
--- a/test/QT/qt3/QTFLAGS.py
+++ b/test/QT/qt3/QTFLAGS.py
@@ -212,9 +212,3 @@ def _flagTest(test,fileToContentsStart):
 test.must_exist(['work2', 'main' + _exe])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/Tool.py b/test/QT/qt3/Tool.py
index 1b34ea2ab9..c7acfb0e76 100644
--- a/test/QT/qt3/Tool.py
+++ b/test/QT/qt3/Tool.py
@@ -53,7 +53,7 @@ def DoWithVariables(variables, prefix, what):
     env[ name ].append(variables[ name ])
 
   result = what()
-  
+
   for name in saved_variables.keys():
     env[ name ] = saved_variables[ name ]
     env[ prefix+name ] = variables[ name ]
@@ -68,7 +68,7 @@ def CheckForQtAt(context, qtdir):
       { "LIBS": "qt-mt", "LIBPATH": libp , "CPPPATH": cppp },
       '''
 #include <qapplication.h>
-int main(int argc, char **argv) { 
+int main(int argc, char **argv) {
   QApplication qapp(argc, argv);
   return 0;
 }
@@ -91,7 +91,7 @@ def CheckForQt(context):
 
   if 'QTDIR' in os.environ:
     potential_qt_dirs.insert(0, os.environ['QTDIR'])
-  
+
   if env[ 'qt_directory' ] != "/":
      uic_path = os.path.join(env['qt_directory'], 'bin', 'uic')
      if os.path.isfile(uic_path):
@@ -129,7 +129,7 @@ def AttemptLinkWithVariables(context, variables, code, extension, prefix):
 
 env = Environment(CPPPATH=['.'], LIBPATH=['.'], LIBS=[])
 
-opts = Variables('lprof.conf') 
+opts = Variables('lprof.conf')
 opts.Add(PathVariable("qt_directory", "Path to Qt directory", "/"))
 opts.Update(env)
 
@@ -148,9 +148,3 @@ def AttemptLinkWithVariables(context, variables, code, extension, prefix):
 test.run(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/copied-env.py b/test/QT/qt3/copied-env.py
index caeff6d897..7be6b90bad 100644
--- a/test/QT/qt3/copied-env.py
+++ b/test/QT/qt3/copied-env.py
@@ -75,9 +75,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/empty-env.py b/test/QT/qt3/empty-env.py
index cd14340804..9441762d6c 100644
--- a/test/QT/qt3/empty-env.py
+++ b/test/QT/qt3/empty-env.py
@@ -70,9 +70,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/generated-ui.py b/test/QT/qt3/generated-ui.py
index d43b21b000..96c33e6378 100644
--- a/test/QT/qt3/generated-ui.py
+++ b/test/QT/qt3/generated-ui.py
@@ -127,9 +127,3 @@ def exists(env):
 test.up_to_date(arguments=".")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/installed.py b/test/QT/qt3/installed.py
index 71ff98fb70..40a252b965 100644
--- a/test/QT/qt3/installed.py
+++ b/test/QT/qt3/installed.py
@@ -212,9 +212,3 @@ class MyClass2 : public QObject {
 test.fail_test(expect1 not in test.stderr() and expect2 not in test.stderr())
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/manual.py b/test/QT/qt3/manual.py
index f467b5ae2c..189ef64786 100644
--- a/test/QT/qt3/manual.py
+++ b/test/QT/qt3/manual.py
@@ -140,9 +140,3 @@
 test.must_exist(test.workpath('fff.moc.cpp'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/moc-from-cpp.py b/test/QT/qt3/moc-from-cpp.py
index bbab8cab8f..5a45ea183f 100644
--- a/test/QT/qt3/moc-from-cpp.py
+++ b/test/QT/qt3/moc-from-cpp.py
@@ -106,9 +106,3 @@
 test.must_exist(test.workpath('build_dup0', moc))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/moc-from-header.py b/test/QT/qt3/moc-from-header.py
index 65a12e1edf..3b671c9160 100644
--- a/test/QT/qt3/moc-from-header.py
+++ b/test/QT/qt3/moc-from-header.py
@@ -101,9 +101,3 @@
 test.must_exist(['build_dup0', moc])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/qt_warnings.py b/test/QT/qt3/qt_warnings.py
index 1cbf2b0138..367c951019 100644
--- a/test/QT/qt3/qt_warnings.py
+++ b/test/QT/qt3/qt_warnings.py
@@ -96,9 +96,3 @@
 test.fail_test(not test.match_re(test.stderr(), expect))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/reentrant.py b/test/QT/qt3/reentrant.py
index be6d8a62f5..b827c13727 100644
--- a/test/QT/qt3/reentrant.py
+++ b/test/QT/qt3/reentrant.py
@@ -66,9 +66,3 @@
     stdout='qt/include/foo5.h\n',
 )
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/source-from-ui.py b/test/QT/qt3/source-from-ui.py
index aaa4eeea49..1e244e6b76 100644
--- a/test/QT/qt3/source-from-ui.py
+++ b/test/QT/qt3/source-from-ui.py
@@ -153,9 +153,3 @@
 test.must_not_exist(test.workpath(h))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/qt3/up-to-date.py b/test/QT/qt3/up-to-date.py
index ec51238279..77691ad433 100644
--- a/test/QT/qt3/up-to-date.py
+++ b/test/QT/qt3/up-to-date.py
@@ -136,9 +136,3 @@ def exists(env):
 test.up_to_date(options='--debug=explain', arguments=expect, stderr=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RANLIB/RANLIB.py b/test/RANLIB/RANLIB.py
index 3bcb414451..3b5fcf588c 100644
--- a/test/RANLIB/RANLIB.py
+++ b/test/RANLIB/RANLIB.py
@@ -103,9 +103,3 @@
 test.must_match('wrapper.out',"wrapper.py\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RANLIB/RANLIBCOM.py b/test/RANLIB/RANLIBCOM.py
index 6a3ea0fd72..6267c90316 100644
--- a/test/RANLIB/RANLIBCOM.py
+++ b/test/RANLIB/RANLIBCOM.py
@@ -59,9 +59,3 @@
 test.must_match('output.lib', "file.1\nfile.2\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RANLIB/RANLIBCOMSTR.py b/test/RANLIB/RANLIBCOMSTR.py
index 2b8fc83014..32c4752bcf 100644
--- a/test/RANLIB/RANLIBCOMSTR.py
+++ b/test/RANLIB/RANLIBCOMSTR.py
@@ -68,9 +68,3 @@
 test.must_match('output.lib', "file.1\nfile.2\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RANLIB/RANLIBFLAGS.py b/test/RANLIB/RANLIBFLAGS.py
index 93a5abf333..4293496e09 100644
--- a/test/RANLIB/RANLIBFLAGS.py
+++ b/test/RANLIB/RANLIBFLAGS.py
@@ -104,9 +104,3 @@
 test.must_match('wrapper.out', "wrapper.py\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RPATH.py b/test/RPATH.py
index 754abfe7a0..8363e0c93b 100644
--- a/test/RPATH.py
+++ b/test/RPATH.py
@@ -69,9 +69,3 @@
 test.run(program=foo, chdir=test.workpath('.'), stdout='bar\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/BuildDir/BuildDir.py b/test/Removed/BuildDir/BuildDir.py
index 4b0f14aeff..6c13bf7312 100644
--- a/test/Removed/BuildDir/BuildDir.py
+++ b/test/Removed/BuildDir/BuildDir.py
@@ -55,9 +55,3 @@
 test.must_contain_all(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/BuildDir/Old/BuildDir.py b/test/Removed/BuildDir/Old/BuildDir.py
index a905403a3a..3152418984 100644
--- a/test/Removed/BuildDir/Old/BuildDir.py
+++ b/test/Removed/BuildDir/Old/BuildDir.py
@@ -287,9 +287,3 @@ def equal_stats(x,y):
 test.fail_test(TestSCons.match_re_dotall(stderr, 6*warning))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/BuildDir/Old/SConscript-build_dir.py b/test/Removed/BuildDir/Old/SConscript-build_dir.py
index ed520370ee..4d78cf6786 100644
--- a/test/Removed/BuildDir/Old/SConscript-build_dir.py
+++ b/test/Removed/BuildDir/Old/SConscript-build_dir.py
@@ -283,9 +283,3 @@ def equal_stats(x,y):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/BuildDir/SConscript-build_dir.py b/test/Removed/BuildDir/SConscript-build_dir.py
index 77b6ee485a..06328fe359 100644
--- a/test/Removed/BuildDir/SConscript-build_dir.py
+++ b/test/Removed/BuildDir/SConscript-build_dir.py
@@ -49,9 +49,3 @@
 test.run(arguments='-Q -s', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/CacheDir/Old/timestamp-content.py b/test/Removed/CacheDir/Old/timestamp-content.py
index 860d0f3c60..850c369a53 100644
--- a/test/Removed/CacheDir/Old/timestamp-content.py
+++ b/test/Removed/CacheDir/Old/timestamp-content.py
@@ -60,9 +60,3 @@
 test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/CacheDir/Old/timestamp-timestamp.py b/test/Removed/CacheDir/Old/timestamp-timestamp.py
index eec70b5fb4..73dce091e0 100644
--- a/test/Removed/CacheDir/Old/timestamp-timestamp.py
+++ b/test/Removed/CacheDir/Old/timestamp-timestamp.py
@@ -60,9 +60,3 @@
 test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/Copy-Method/Copy-Method.py b/test/Removed/Copy-Method/Copy-Method.py
index 9bcd787726..614316d6bf 100644
--- a/test/Removed/Copy-Method/Copy-Method.py
+++ b/test/Removed/Copy-Method/Copy-Method.py
@@ -43,9 +43,3 @@
 test.must_contain_all(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/Copy-Method/Old/Copy-Method.py b/test/Removed/Copy-Method/Old/Copy-Method.py
index 2714f648b1..d03d028df7 100644
--- a/test/Removed/Copy-Method/Old/Copy-Method.py
+++ b/test/Removed/Copy-Method/Old/Copy-Method.py
@@ -42,9 +42,3 @@
 test.deprecated_warning('deprecated-copy', msg)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/Old/SConscript-must_exist_deprecation.py b/test/Removed/Old/SConscript-must_exist_deprecation.py
index 4c1db12753..8e78b24c95 100644
--- a/test/Removed/Old/SConscript-must_exist_deprecation.py
+++ b/test/Removed/Old/SConscript-must_exist_deprecation.py
@@ -49,9 +49,3 @@
 expect_stderr = warnmsg
 test.run(arguments=".", stderr=expect_stderr)
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/Old/TaskmasterNeedsExecute.py b/test/Removed/Old/TaskmasterNeedsExecute.py
index 9f7ade1df8..6fa426dab8 100644
--- a/test/Removed/Old/TaskmasterNeedsExecute.py
+++ b/test/Removed/Old/TaskmasterNeedsExecute.py
@@ -45,9 +45,3 @@
 test.deprecated_warning('taskmaster-needs-execute', msg)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/Old/warn-missing-sconscript.py b/test/Removed/Old/warn-missing-sconscript.py
index 2c733aae7d..3fe4b188a2 100644
--- a/test/Removed/Old/warn-missing-sconscript.py
+++ b/test/Removed/Old/warn-missing-sconscript.py
@@ -67,9 +67,3 @@ def build(target, source, env):
 test.run(arguments='WARN=no-missing-sconscript .', stderr="")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceCode/Old/SourceCode.py b/test/Removed/SourceCode/Old/SourceCode.py
index b7f13055a8..c1ee073706 100644
--- a/test/Removed/SourceCode/Old/SourceCode.py
+++ b/test/Removed/SourceCode/Old/SourceCode.py
@@ -115,9 +115,3 @@ def sc_cat(env, source, target):
 test.must_match('ddd.out', "sub2/sc-ddd.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceCode/SourceCode.py b/test/Removed/SourceCode/SourceCode.py
index a0d647bf41..d33061af44 100644
--- a/test/Removed/SourceCode/SourceCode.py
+++ b/test/Removed/SourceCode/SourceCode.py
@@ -53,9 +53,3 @@
 test.must_contain_all(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceSignatures/Old/basic.py b/test/Removed/SourceSignatures/Old/basic.py
index 7951dbd66d..392d5f9179 100644
--- a/test/Removed/SourceSignatures/Old/basic.py
+++ b/test/Removed/SourceSignatures/Old/basic.py
@@ -76,10 +76,10 @@ def write_SConstruct(test, sigtype):
          stderr = expect)
 
 
-os.utime(test.workpath('f1.in'), 
+os.utime(test.workpath('f1.in'),
          (os.path.getatime(test.workpath('f1.in')),
           os.path.getmtime(test.workpath('f1.in'))+10))
-os.utime(test.workpath('f3.in'), 
+os.utime(test.workpath('f3.in'),
          (os.path.getatime(test.workpath('f3.in')),
           os.path.getmtime(test.workpath('f3.in'))+10))
 
@@ -123,9 +123,3 @@ def write_SConstruct(test, sigtype):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceSignatures/Old/env.py b/test/Removed/SourceSignatures/Old/env.py
index bf86d4d34b..ae54379f80 100644
--- a/test/Removed/SourceSignatures/Old/env.py
+++ b/test/Removed/SourceSignatures/Old/env.py
@@ -100,9 +100,3 @@ def write_SConstruct(test, env_sigtype, default_sigtype):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceSignatures/Old/implicit-cache.py b/test/Removed/SourceSignatures/Old/implicit-cache.py
index a4bdc7841c..88c058f1d8 100644
--- a/test/Removed/SourceSignatures/Old/implicit-cache.py
+++ b/test/Removed/SourceSignatures/Old/implicit-cache.py
@@ -97,9 +97,3 @@ def build(env, target, source):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceSignatures/Old/no-csigs.py b/test/Removed/SourceSignatures/Old/no-csigs.py
index ff6968cec2..161661d40d 100644
--- a/test/Removed/SourceSignatures/Old/no-csigs.py
+++ b/test/Removed/SourceSignatures/Old/no-csigs.py
@@ -69,9 +69,3 @@ def build(env, target, source):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceSignatures/Old/overrides.py b/test/Removed/SourceSignatures/Old/overrides.py
index 4303c0e467..3c814cc502 100644
--- a/test/Removed/SourceSignatures/Old/overrides.py
+++ b/test/Removed/SourceSignatures/Old/overrides.py
@@ -60,9 +60,3 @@
 test.not_up_to_date(arguments = 'foo.out', stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceSignatures/Old/switch-rebuild.py b/test/Removed/SourceSignatures/Old/switch-rebuild.py
index b9cc3d5224..1c2e4eb64c 100644
--- a/test/Removed/SourceSignatures/Old/switch-rebuild.py
+++ b/test/Removed/SourceSignatures/Old/switch-rebuild.py
@@ -88,9 +88,3 @@ def write_SConstruct(test, sig_type):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/SourceSignatures/SourceSignatures.py b/test/Removed/SourceSignatures/SourceSignatures.py
index 04d2ed7c86..0c11fe9207 100644
--- a/test/Removed/SourceSignatures/SourceSignatures.py
+++ b/test/Removed/SourceSignatures/SourceSignatures.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# 
+#
 # __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -49,9 +49,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/TargetSignatures/Old/build-content.py b/test/Removed/TargetSignatures/Old/build-content.py
index efdaaeedd3..fab2242552 100644
--- a/test/Removed/TargetSignatures/Old/build-content.py
+++ b/test/Removed/TargetSignatures/Old/build-content.py
@@ -134,9 +134,3 @@ def write_SConstruct(test, *args):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/TargetSignatures/Old/content.py b/test/Removed/TargetSignatures/Old/content.py
index aca63f306d..d409abaf10 100644
--- a/test/Removed/TargetSignatures/Old/content.py
+++ b/test/Removed/TargetSignatures/Old/content.py
@@ -87,9 +87,3 @@ def copy(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/TargetSignatures/Old/overrides.py b/test/Removed/TargetSignatures/Old/overrides.py
index 54a66d47d0..ae0bd1f114 100644
--- a/test/Removed/TargetSignatures/Old/overrides.py
+++ b/test/Removed/TargetSignatures/Old/overrides.py
@@ -56,9 +56,3 @@
 test.must_match('foo.out', "foo.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/TargetSignatures/TargetSignatures.py b/test/Removed/TargetSignatures/TargetSignatures.py
index edd60a27f8..3bf9239f61 100644
--- a/test/Removed/TargetSignatures/TargetSignatures.py
+++ b/test/Removed/TargetSignatures/TargetSignatures.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# 
+#
 # __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -49,9 +49,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/debug-dtree.py b/test/Removed/debug-dtree.py
index 0cd41b37c8..5704f88e89 100644
--- a/test/Removed/debug-dtree.py
+++ b/test/Removed/debug-dtree.py
@@ -48,9 +48,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/debug-nomemoizer.py b/test/Removed/debug-nomemoizer.py
index 827ace606a..20baad0a98 100644
--- a/test/Removed/debug-nomemoizer.py
+++ b/test/Removed/debug-nomemoizer.py
@@ -48,9 +48,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/debug-stree.py b/test/Removed/debug-stree.py
index 81d21f748d..3f92b6906e 100644
--- a/test/Removed/debug-stree.py
+++ b/test/Removed/debug-stree.py
@@ -48,9 +48,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/debug-tree.py b/test/Removed/debug-tree.py
index 81063daad4..8ee5074fce 100644
--- a/test/Removed/debug-tree.py
+++ b/test/Removed/debug-tree.py
@@ -55,9 +55,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/CPPPATH.py b/test/Repository/CPPPATH.py
index e523fe8585..6299c875cf 100644
--- a/test/Repository/CPPPATH.py
+++ b/test/Repository/CPPPATH.py
@@ -88,9 +88,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Default.py b/test/Repository/Default.py
index e33a26e866..cc36d11b0e 100644
--- a/test/Repository/Default.py
+++ b/test/Repository/Default.py
@@ -99,9 +99,3 @@ def copy(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Install-Local.py b/test/Repository/Install-Local.py
index fe64feb634..7507bd79ae 100644
--- a/test/Repository/Install-Local.py
+++ b/test/Repository/Install-Local.py
@@ -80,9 +80,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Install.py b/test/Repository/Install.py
index 9c1259ac6e..ef08b93efb 100644
--- a/test/Repository/Install.py
+++ b/test/Repository/Install.py
@@ -56,9 +56,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/InstallAs.py b/test/Repository/InstallAs.py
index c153771075..4dff61390d 100644
--- a/test/Repository/InstallAs.py
+++ b/test/Repository/InstallAs.py
@@ -63,9 +63,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Java.py b/test/Repository/Java.py
index 17ef960f69..a0c5cf32ca 100644
--- a/test/Repository/Java.py
+++ b/test/Repository/Java.py
@@ -256,9 +256,3 @@
 #test.up_to_date(chdir = 'work2', options = opts, arguments = ".")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/JavaH.py b/test/Repository/JavaH.py
index a81049c017..6d1f1691a5 100644
--- a/test/Repository/JavaH.py
+++ b/test/Repository/JavaH.py
@@ -302,9 +302,3 @@
 #test.up_to_date(chdir = 'work2', options = opts, arguments = ".")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/LIBPATH.py b/test/Repository/LIBPATH.py
index 9e19b3f64d..1954ac9753 100644
--- a/test/Repository/LIBPATH.py
+++ b/test/Repository/LIBPATH.py
@@ -123,9 +123,3 @@ def write_LIBDIRFLAGS(env, target, source):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Local.py b/test/Repository/Local.py
index a906245067..4c43e66f0d 100644
--- a/test/Repository/Local.py
+++ b/test/Repository/Local.py
@@ -114,9 +114,3 @@ def bbb_copy(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/M4.py b/test/Repository/M4.py
index 2e404687b8..2d2a67d735 100644
--- a/test/Repository/M4.py
+++ b/test/Repository/M4.py
@@ -102,9 +102,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Program.py b/test/Repository/Program.py
index 1fc0dcfa9d..7d28a8b9ac 100644
--- a/test/Repository/Program.py
+++ b/test/Repository/Program.py
@@ -353,9 +353,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/RMIC.py b/test/Repository/RMIC.py
index 92421be999..5e14e05878 100644
--- a/test/Repository/RMIC.py
+++ b/test/Repository/RMIC.py
@@ -386,9 +386,3 @@
 test.up_to_date(chdir = 'work3', options = opts, arguments = ".")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/SConscript.py b/test/Repository/SConscript.py
index 3208304915..e15ca85730 100644
--- a/test/Repository/SConscript.py
+++ b/test/Repository/SConscript.py
@@ -114,9 +114,3 @@ def cat(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/SConsignFile.py b/test/Repository/SConsignFile.py
index fef2c7597d..9643cb84f5 100644
--- a/test/Repository/SConsignFile.py
+++ b/test/Repository/SConsignFile.py
@@ -59,9 +59,3 @@
 test.must_not_exist(['work', 'file.out'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/SharedLibrary.py b/test/Repository/SharedLibrary.py
index 02aeb193d3..90ff2523dd 100644
--- a/test/Repository/SharedLibrary.py
+++ b/test/Repository/SharedLibrary.py
@@ -121,9 +121,3 @@
          stdout = "f1.c\nf2.c\nf3.c\nprog.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/StaticLibrary.py b/test/Repository/StaticLibrary.py
index a0360ffb8b..09170be7a4 100644
--- a/test/Repository/StaticLibrary.py
+++ b/test/Repository/StaticLibrary.py
@@ -231,9 +231,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/VariantDir.py b/test/Repository/VariantDir.py
index eb33aa155c..fc055a5274 100644
--- a/test/Repository/VariantDir.py
+++ b/test/Repository/VariantDir.py
@@ -197,9 +197,3 @@ def cat(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/absolute-path.py b/test/Repository/absolute-path.py
index 8e363e0887..f742f1d317 100644
--- a/test/Repository/absolute-path.py
+++ b/test/Repository/absolute-path.py
@@ -101,9 +101,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/include.py b/test/Repository/include.py
index 176b0a2def..cf32297f8b 100644
--- a/test/Repository/include.py
+++ b/test/Repository/include.py
@@ -184,9 +184,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/link-object.py b/test/Repository/link-object.py
index f7966d1a0b..1a17b981bd 100644
--- a/test/Repository/link-object.py
+++ b/test/Repository/link-object.py
@@ -145,9 +145,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/multi-dir.py b/test/Repository/multi-dir.py
index 757ed0c211..f470769949 100644
--- a/test/Repository/multi-dir.py
+++ b/test/Repository/multi-dir.py
@@ -128,9 +128,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/no-SConsignFile.py b/test/Repository/no-SConsignFile.py
index 6b5b3e2264..3fdb91b60c 100644
--- a/test/Repository/no-SConsignFile.py
+++ b/test/Repository/no-SConsignFile.py
@@ -69,9 +69,3 @@
 test.up_to_date(chdir='build', arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/no-repository.py b/test/Repository/no-repository.py
index ba6138d69d..af352d2f62 100644
--- a/test/Repository/no-repository.py
+++ b/test/Repository/no-repository.py
@@ -86,9 +86,3 @@
 test.up_to_date(chdir = 'work', arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/option-c.py b/test/Repository/option-c.py
index a73bcf783e..f7ab4edcb2 100644
--- a/test/Repository/option-c.py
+++ b/test/Repository/option-c.py
@@ -181,9 +181,3 @@ def copy(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/option-f.py b/test/Repository/option-f.py
index 0dfea7504c..f9caf7a693 100644
--- a/test/Repository/option-f.py
+++ b/test/Repository/option-f.py
@@ -95,9 +95,3 @@ def cat(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/option-n.py b/test/Repository/option-n.py
index d99e92ade7..4235b3a3ab 100644
--- a/test/Repository/option-n.py
+++ b/test/Repository/option-n.py
@@ -93,9 +93,3 @@ def copy(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/signature-order.py b/test/Repository/signature-order.py
index 2c00b34aeb..fd3618287e 100644
--- a/test/Repository/signature-order.py
+++ b/test/Repository/signature-order.py
@@ -120,9 +120,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/targets.py b/test/Repository/targets.py
index 5899c57b36..9bf3383ee4 100644
--- a/test/Repository/targets.py
+++ b/test/Repository/targets.py
@@ -97,9 +97,3 @@ def cat(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/top-level-path.py b/test/Repository/top-level-path.py
index bc2ce72942..234f432b5f 100644
--- a/test/Repository/top-level-path.py
+++ b/test/Repository/top-level-path.py
@@ -100,9 +100,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/variants.py b/test/Repository/variants.py
index 6f0b62738d..2f4b5c3df4 100644
--- a/test/Repository/variants.py
+++ b/test/Repository/variants.py
@@ -432,9 +432,3 @@
 test.fail_test(os.path.exists(test.workpath('work2', 'src2', database_name)))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/within-repository.py b/test/Repository/within-repository.py
index f9a04e6c81..be75c593f0 100644
--- a/test/Repository/within-repository.py
+++ b/test/Repository/within-repository.py
@@ -139,9 +139,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Requires/basic.py b/test/Requires/basic.py
index 2948d9da61..19a7f57392 100644
--- a/test/Requires/basic.py
+++ b/test/Requires/basic.py
@@ -94,9 +94,3 @@ def append_prereq_func(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Requires/eval-order.py b/test/Requires/eval-order.py
index b076d51132..d244fe591a 100644
--- a/test/Requires/eval-order.py
+++ b/test/Requires/eval-order.py
@@ -60,9 +60,3 @@ def copy_and_create_func(target, source, env):
 test.must_match('file.out', "file.in 1\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index 86cdd71450..e138c3c092 100644
--- a/test/Rpcgen/RPCGEN.py
+++ b/test/Rpcgen/RPCGEN.py
@@ -77,9 +77,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index 1143227849..2793970dcd 100644
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -80,9 +80,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index 3673a23d17..679909e309 100644
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -79,9 +79,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index 6223ba362c..0188fa9ae4 100644
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -80,9 +80,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index 7cdf430888..8e10431881 100644
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -80,9 +80,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index 2f6d8d9c14..a3439205a8 100644
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -80,9 +80,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/live.py b/test/Rpcgen/live.py
index 1e31694ee1..ae12dd782d 100644
--- a/test/Rpcgen/live.py
+++ b/test/Rpcgen/live.py
@@ -114,9 +114,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCONSFLAGS.py b/test/SCONSFLAGS.py
index ffccf1f2f8..3c2ba661ad 100644
--- a/test/SCONSFLAGS.py
+++ b/test/SCONSFLAGS.py
@@ -73,9 +73,3 @@
 test.run(status=2, stderr=expect, match=TestSCons.match_exact)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCONS_LIB_DIR.py b/test/SCONS_LIB_DIR.py
index 5691f61b81..c893806338 100644
--- a/test/SCONS_LIB_DIR.py
+++ b/test/SCONS_LIB_DIR.py
@@ -45,9 +45,3 @@ def main ():
 test.run(stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/Return.py b/test/SConscript/Return.py
index dcbedee2a1..c8f03737a2 100644
--- a/test/SConscript/Return.py
+++ b/test/SConscript/Return.py
@@ -98,9 +98,3 @@
 test.run(arguments = '-q -Q', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/SConscript.py b/test/SConscript/SConscript.py
index a9ede48a40..405d67c492 100644
--- a/test/SConscript/SConscript.py
+++ b/test/SConscript/SConscript.py
@@ -217,9 +217,3 @@ def scan():
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/SConscriptChdir.py b/test/SConscript/SConscriptChdir.py
index 5468a54868..8dddbe18f3 100644
--- a/test/SConscript/SConscriptChdir.py
+++ b/test/SConscript/SConscriptChdir.py
@@ -92,9 +92,3 @@
 test.must_match(['dir4', 'test.txt'],"This is the dir4 test.\n", mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/env.py b/test/SConscript/env.py
index 813d717734..74ebe6c47e 100644
--- a/test/SConscript/env.py
+++ b/test/SConscript/env.py
@@ -88,9 +88,3 @@ def builder(target, source, env):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/must_exist.py b/test/SConscript/must_exist.py
index 90f447ef11..69dd528787 100644
--- a/test/SConscript/must_exist.py
+++ b/test/SConscript/must_exist.py
@@ -125,9 +125,3 @@ def user_error(e):
 expect_stderr = err1 + err2 + nowarn + nowarn + nowarn
 test.run(arguments=".", stderr=expect_stderr)
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/src_dir.py b/test/SConscript/src_dir.py
index 967e391c70..025db122e3 100644
--- a/test/SConscript/src_dir.py
+++ b/test/SConscript/src_dir.py
@@ -44,7 +44,7 @@
 env = Environment()
 
 for src_dir in ['src','samples']:
-    SConscript('build/glob_build.py', 
+    SConscript('build/glob_build.py',
                src_dir=src_dir,
                variant_dir='build/output/'+src_dir,
                duplicate=0,
@@ -97,9 +97,3 @@
 test.run(program = hello, stdout = "Hello, world!\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/variables.py b/test/SConscript/variables.py
index 0bb3cd00d0..eb51457ed9 100644
--- a/test/SConscript/variables.py
+++ b/test/SConscript/variables.py
@@ -44,7 +44,7 @@
 test.write("SConstruct", """
 x = 'x'
 y = 'zoom'
-Export(list(globals().keys()))                         
+Export(list(globals().keys()))
 SConscript('SConscript')
 """)
 
@@ -63,7 +63,7 @@
 test.write("SConstruct", """
 x = 'x'
 y = 'zoom'
-Export(globals())                         
+Export(globals())
 SConscript('SConscript')
 """)
 
@@ -139,9 +139,3 @@ def f():
 test.run(arguments = ".")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/white-space.py b/test/SConscript/white-space.py
index cc8f00e965..a9c0852360 100644
--- a/test/SConscript/white-space.py
+++ b/test/SConscript/white-space.py
@@ -48,9 +48,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/default.py b/test/SConsignFile/default.py
index 99ae54ee2e..d1f7bb7c22 100644
--- a/test/SConsignFile/default.py
+++ b/test/SConsignFile/default.py
@@ -65,7 +65,7 @@
 test.must_exist(test.workpath(database_filename))
 test.must_not_exist(test.workpath(database_name))
 test.must_not_exist(test.workpath('subdir', database_name))
-  
+
 test.must_match('f1.out', "f1.in\n")
 test.must_match('f2.out', "f2.in\n")
 test.must_match(['subdir', 'f3.out'], "subdir/f3.in\n")
@@ -78,9 +78,3 @@
 test.must_not_exist(test.workpath('subdir', database_name))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/explicit-dbm-module.py b/test/SConsignFile/explicit-dbm-module.py
index 628d8b5907..c32195ca08 100644
--- a/test/SConsignFile/explicit-dbm-module.py
+++ b/test/SConsignFile/explicit-dbm-module.py
@@ -80,9 +80,3 @@
 test.must_not_exist(test.workpath('subdir', database_name))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/explicit-file.py b/test/SConsignFile/explicit-file.py
index c601f7fa0e..0e4dc98ec8 100644
--- a/test/SConsignFile/explicit-file.py
+++ b/test/SConsignFile/explicit-file.py
@@ -76,9 +76,3 @@
 test.must_not_exist(test.workpath('subdir', database_name))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/make-directory.py b/test/SConsignFile/make-directory.py
index f2a0db1cdb..754f24c1cf 100644
--- a/test/SConsignFile/make-directory.py
+++ b/test/SConsignFile/make-directory.py
@@ -67,9 +67,3 @@
 test.must_exist(['sub', 'dir', 'sconsign.dblite'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/use-dbhash.py b/test/SConsignFile/use-dbhash.py
index 65eb92ca76..af0c2e51a3 100644
--- a/test/SConsignFile/use-dbhash.py
+++ b/test/SConsignFile/use-dbhash.py
@@ -76,7 +76,7 @@
 test.must_not_exist(test.workpath(database_filename))
 test.must_not_exist(test.workpath('subdir', database_name))
 test.must_not_exist(test.workpath('subdir', database_filename))
-  
+
 test.must_match('f1.out', "f1.in\n")
 test.must_match('f2.out', "f2.in\n")
 test.must_match(['subdir', 'f3.out'], "subdir/f3.in\n")
@@ -90,9 +90,3 @@
 test.must_not_exist(test.workpath('subdir', database_filename))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/use-dbm.py b/test/SConsignFile/use-dbm.py
index 6b6c96b6e2..11be82f82d 100644
--- a/test/SConsignFile/use-dbm.py
+++ b/test/SConsignFile/use-dbm.py
@@ -97,9 +97,3 @@
 test.must_not_exist(test.workpath('subdir', database_filename))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/use-dumbdbm.py b/test/SConsignFile/use-dumbdbm.py
index e7fb091605..74912d5bd4 100644
--- a/test/SConsignFile/use-dumbdbm.py
+++ b/test/SConsignFile/use-dumbdbm.py
@@ -77,7 +77,7 @@
 test.must_not_exist(test.workpath('subdir', '{}.dblite'.format(database_name)))
 test.must_not_exist(test.workpath('subdir', '{}.dat'.format(database_name)))
 test.must_not_exist(test.workpath('subdir', '{}.dir'.format(database_name)))
-  
+
 test.must_match('f1.out', "f1.in\n")
 test.must_match('f2.out', "f2.in\n")
 test.must_match(['subdir', 'f3.out'], "subdir/f3.in\n")
@@ -95,9 +95,3 @@
 test.must_not_exist(test.workpath('subdir', '{}.dir'.format(database_name)))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/use-gdbm.py b/test/SConsignFile/use-gdbm.py
index 11ae052cc2..637ab0d73d 100644
--- a/test/SConsignFile/use-gdbm.py
+++ b/test/SConsignFile/use-gdbm.py
@@ -88,9 +88,3 @@
 test.must_not_exist(test.workpath('subdir', database_filename))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConstruct.py b/test/SConstruct.py
index 8bc8617f43..e8a6f9658a 100644
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -95,9 +95,3 @@
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SHELL.py b/test/SHELL.py
index 5d97b97db0..8a110c8afd 100644
--- a/test/SHELL.py
+++ b/test/SHELL.py
@@ -80,9 +80,3 @@ def stripquote(s):
 test.must_match('file.out', "file.in\nextra.txt\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SPAWN.py b/test/SPAWN.py
index 5939f4fca2..07bfabff66 100644
--- a/test/SPAWN.py
+++ b/test/SPAWN.py
@@ -88,9 +88,3 @@ def my_spawn2(sh, escape, cmd, args, env):
 test.must_match('file4.out', "file4.in\nextra2.txt\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIG.py b/test/SWIG/SWIG.py
index 5858952241..c1d13a121f 100644
--- a/test/SWIG/SWIG.py
+++ b/test/SWIG/SWIG.py
@@ -115,9 +115,3 @@
 test.must_exist(test.workpath('test3_wrap' + _obj))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGCOM.py b/test/SWIG/SWIGCOM.py
index b2d8da2c7a..d02672f475 100644
--- a/test/SWIG/SWIGCOM.py
+++ b/test/SWIG/SWIGCOM.py
@@ -52,9 +52,3 @@
 test.must_match('bbb_wrap.cc', "bbb.i\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGCOMSTR.py b/test/SWIG/SWIGCOMSTR.py
index c2c3df38cc..83f29c8909 100644
--- a/test/SWIG/SWIGCOMSTR.py
+++ b/test/SWIG/SWIGCOMSTR.py
@@ -57,9 +57,3 @@
 test.must_match('bbb_wrap.cc', "bbb.i\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGFLAGS.py b/test/SWIG/SWIGFLAGS.py
index 70e16a6752..68e7b19013 100644
--- a/test/SWIG/SWIGFLAGS.py
+++ b/test/SWIG/SWIGFLAGS.py
@@ -66,9 +66,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGOUTDIR-python.py b/test/SWIG/SWIGOUTDIR-python.py
index 8d6703f992..789b164694 100644
--- a/test/SWIG/SWIGOUTDIR-python.py
+++ b/test/SWIG/SWIGOUTDIR-python.py
@@ -82,9 +82,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGOUTDIR.py b/test/SWIG/SWIGOUTDIR.py
index 6b600d704a..5fb7adfc12 100644
--- a/test/SWIG/SWIGOUTDIR.py
+++ b/test/SWIG/SWIGOUTDIR.py
@@ -43,12 +43,12 @@
 
 test.write(['SConstruct'], """\
 env = Environment(tools = ['default', 'swig'],
-                CPPPATH=%(where_java_include)s,                 
+                CPPPATH=%(where_java_include)s,
                 )
 
 Java_foo_interface = env.SharedLibrary(
-    'Java_foo_interface', 
-    'Java_foo_interface.i', 
+    'Java_foo_interface',
+    'Java_foo_interface.i',
     SWIGOUTDIR = 'java/build dir',
     SWIGFLAGS = '-c++ -java -Wall',
     SWIGCXXFILESUFFIX = "_wrap.cpp")
@@ -63,25 +63,19 @@
 test.run(arguments = '.')
 
 test.must_exist('java/build dir/foopackJNI.java')
-test.must_exist('java/build dir/foopack.java') 
+test.must_exist('java/build dir/foopack.java')
 
 # SCons should remove the built .java files.
 test.run(arguments = '-c')
 
 test.must_not_exist('java/build dir/foopackJNI.java')
-test.must_not_exist('java/build dir/foopack.java') 
+test.must_not_exist('java/build dir/foopack.java')
 
 # SCons should realize it needs to rebuild the removed .java files.
 test.not_up_to_date(arguments = '.')
 
 test.must_exist('java/build dir/foopackJNI.java')
-test.must_exist('java/build dir/foopack.java') 
+test.must_exist('java/build dir/foopack.java')
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGPATH.py b/test/SWIG/SWIGPATH.py
index ef4fb184df..f2ee5a45d4 100644
--- a/test/SWIG/SWIGPATH.py
+++ b/test/SWIG/SWIGPATH.py
@@ -85,9 +85,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py
index 372b05227e..7a76e85e12 100644
--- a/test/SWIG/build-dir.py
+++ b/test/SWIG/build-dir.py
@@ -164,9 +164,3 @@ def __iter__(self):
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/generated_swigfile.py b/test/SWIG/generated_swigfile.py
index 8d2a2c9ec9..0c745bc83e 100644
--- a/test/SWIG/generated_swigfile.py
+++ b/test/SWIG/generated_swigfile.py
@@ -75,9 +75,3 @@
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/implicit-dependencies.py b/test/SWIG/implicit-dependencies.py
index 715db83c3f..e85f5319b9 100644
--- a/test/SWIG/implicit-dependencies.py
+++ b/test/SWIG/implicit-dependencies.py
@@ -65,9 +65,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/live.py b/test/SWIG/live.py
index 3d46b74d9d..015b8abe93 100644
--- a/test/SWIG/live.py
+++ b/test/SWIG/live.py
@@ -158,9 +158,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/module-deduced-name.py b/test/SWIG/module-deduced-name.py
index 14d23a2e99..8eea9c3cfa 100644
--- a/test/SWIG/module-deduced-name.py
+++ b/test/SWIG/module-deduced-name.py
@@ -75,9 +75,3 @@
 test.must_exist(['python','build dir','python_foo_interface.py'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/module-parens.py b/test/SWIG/module-parens.py
index 4ce7511c27..93856efd34 100644
--- a/test/SWIG/module-parens.py
+++ b/test/SWIG/module-parens.py
@@ -120,9 +120,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/module-quoted.py b/test/SWIG/module-quoted.py
index 60bc0b0bf4..cc1ea30a4c 100644
--- a/test/SWIG/module-quoted.py
+++ b/test/SWIG/module-quoted.py
@@ -95,9 +95,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/module-spaces.py b/test/SWIG/module-spaces.py
index 6a3f270c4f..ce1fa92a15 100644
--- a/test/SWIG/module-spaces.py
+++ b/test/SWIG/module-spaces.py
@@ -95,9 +95,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/noproxy.py b/test/SWIG/noproxy.py
index deeaa3a67d..b40929587a 100644
--- a/test/SWIG/noproxy.py
+++ b/test/SWIG/noproxy.py
@@ -38,7 +38,7 @@
 if sys.platform == 'win32':
     _dll = '.dll'
 else:
-    _dll   = '.so' 
+    _dll   = '.so'
 
 test = TestSCons.TestSCons()
 
@@ -85,9 +85,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/recursive-includes-cpp.py b/test/SWIG/recursive-includes-cpp.py
index 77ba2d4e82..0d4cf23857 100644
--- a/test/SWIG/recursive-includes-cpp.py
+++ b/test/SWIG/recursive-includes-cpp.py
@@ -138,9 +138,3 @@
 test.up_to_date()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/remove-modules.py b/test/SWIG/remove-modules.py
index 4ce8eab84d..f8349d842a 100644
--- a/test/SWIG/remove-modules.py
+++ b/test/SWIG/remove-modules.py
@@ -87,9 +87,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/subdir.py b/test/SWIG/subdir.py
index 9336f19516..e2c6307e14 100644
--- a/test/SWIG/subdir.py
+++ b/test/SWIG/subdir.py
@@ -104,9 +104,3 @@
 test.up_to_date(options = '--debug=explain', arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/CrossLanguageNoExtension.py b/test/Scanner/CrossLanguageNoExtension.py
index fa38d2fed3..725fc4d83f 100644
--- a/test/Scanner/CrossLanguageNoExtension.py
+++ b/test/Scanner/CrossLanguageNoExtension.py
@@ -102,9 +102,3 @@ def k2file_scan(node, env, scanpaths, arg):
 test.run(arguments='k k2', stdout=expected_stdout)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/Dir.py b/test/Scanner/Dir.py
index fa4f6c9f9f..b08097c1af 100644
--- a/test/Scanner/Dir.py
+++ b/test/Scanner/Dir.py
@@ -76,9 +76,3 @@ def mybuilder(target, source, env):
 test.must_match(['install', 'dir2', 'infile2'], "src/infile2\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/Entry-to-Dir.py b/test/Scanner/Entry-to-Dir.py
index 423a717e2d..0b5dbd719d 100644
--- a/test/Scanner/Entry-to-Dir.py
+++ b/test/Scanner/Entry-to-Dir.py
@@ -57,9 +57,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/FindPathDirs.py b/test/Scanner/FindPathDirs.py
index 3f5204aea8..fcaf159397 100644
--- a/test/Scanner/FindPathDirs.py
+++ b/test/Scanner/FindPathDirs.py
@@ -147,9 +147,3 @@ def kfile_scan(node, env, path, arg):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/Python.py b/test/Scanner/Python.py
index b5b3ae50a8..8628e06186 100644
--- a/test/Scanner/Python.py
+++ b/test/Scanner/Python.py
@@ -37,9 +37,3 @@
 test.dir_fixture('Python')
 test.run(arguments = '.')
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/Scanner.py b/test/Scanner/Scanner.py
index d64a7ab6cd..a98b2c6871 100644
--- a/test/Scanner/Scanner.py
+++ b/test/Scanner/Scanner.py
@@ -239,9 +239,3 @@ def third(env, target, source):
 test.up_to_date(arguments = 'foo')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/dictionary.py b/test/Scanner/dictionary.py
index f80c7e55d6..653067080c 100644
--- a/test/Scanner/dictionary.py
+++ b/test/Scanner/dictionary.py
@@ -197,9 +197,3 @@ def kfile_scan3(node, env, scanpaths, arg=None):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/empty-implicit.py b/test/Scanner/empty-implicit.py
index 33482d2a7c..19b36e25f1 100644
--- a/test/Scanner/empty-implicit.py
+++ b/test/Scanner/empty-implicit.py
@@ -80,9 +80,3 @@ def echo(env, target, source):
 test.up_to_date(options = '--implicit-cache', arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/exception.py b/test/Scanner/exception.py
index c87d93df0b..be68909fc3 100644
--- a/test/Scanner/exception.py
+++ b/test/Scanner/exception.py
@@ -108,9 +108,3 @@ def cat(env, source, target):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index f62bf9abc2..b2c2a0cb6c 100644
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -436,9 +436,3 @@ def __call__(self, node, *args, **kw):
 """, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/multi-env.py b/test/Scanner/multi-env.py
index e9c231d2cb..81a0525709 100644
--- a/test/Scanner/multi-env.py
+++ b/test/Scanner/multi-env.py
@@ -115,9 +115,3 @@ def process(infp, outfp):
 test.must_match('frog.2', 'include sound1\nrudeep\n', mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/no-Dir-node.py b/test/Scanner/no-Dir-node.py
index e10dc5d983..876cba8c2d 100644
--- a/test/Scanner/no-Dir-node.py
+++ b/test/Scanner/no-Dir-node.py
@@ -131,9 +131,3 @@ def foo(target, source, env):
 """ % locals(), mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/parallel-rescan.py b/test/Scanner/parallel-rescan.py
index 9f8e3f141b..4a1f27e943 100644
--- a/test/Scanner/parallel-rescan.py
+++ b/test/Scanner/parallel-rescan.py
@@ -70,9 +70,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/scan-once.py b/test/Scanner/scan-once.py
index 304b523762..b2a6259a62 100644
--- a/test/Scanner/scan-once.py
+++ b/test/Scanner/scan-once.py
@@ -92,9 +92,3 @@ def echo(env, target, source):
 """))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/source_scanner-dict.py b/test/Scanner/source_scanner-dict.py
index 115c19ee8a..6aefcd3df3 100644
--- a/test/Scanner/source_scanner-dict.py
+++ b/test/Scanner/source_scanner-dict.py
@@ -216,9 +216,3 @@ def k3_scan(node, env, scanpaths, arg=None):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/unicode.py b/test/Scanner/unicode.py
index 514a92c847..7365d54b0c 100644
--- a/test/Scanner/unicode.py
+++ b/test/Scanner/unicode.py
@@ -274,9 +274,3 @@ def kfile_scan(node, env, scanpaths, arg):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Script-import.py b/test/Script-import.py
index 504de0efd3..5b2d5446e1 100644
--- a/test/Script-import.py
+++ b/test/Script-import.py
@@ -104,9 +104,3 @@
 test.must_match("file.out", "file.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SideEffect/Issues/3013/sideffect_with_variantdir.py b/test/SideEffect/Issues/3013/sideffect_with_variantdir.py
index 9ca3eca018..c4581f2fb2 100644
--- a/test/SideEffect/Issues/3013/sideffect_with_variantdir.py
+++ b/test/SideEffect/Issues/3013/sideffect_with_variantdir.py
@@ -40,10 +40,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
-
diff --git a/test/SideEffect/basic.py b/test/SideEffect/basic.py
index aa8099c5d2..d946a4ed27 100644
--- a/test/SideEffect/basic.py
+++ b/test/SideEffect/basic.py
@@ -106,9 +106,3 @@ def build(env, source, target):
 test.must_match('log.txt', expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SideEffect/directory.py b/test/SideEffect/directory.py
index 9fcbea2e1f..e133da5a1f 100644
--- a/test/SideEffect/directory.py
+++ b/test/SideEffect/directory.py
@@ -72,9 +72,3 @@ def build(env, source, target):
 test.must_exist(test.workpath('log', 'blat.out'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SideEffect/parallel.py b/test/SideEffect/parallel.py
index 43a0d64b85..c8f5d4700c 100644
--- a/test/SideEffect/parallel.py
+++ b/test/SideEffect/parallel.py
@@ -130,9 +130,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SideEffect/variant_dir.py b/test/SideEffect/variant_dir.py
index 3f815d313c..6d514a1734 100644
--- a/test/SideEffect/variant_dir.py
+++ b/test/SideEffect/variant_dir.py
@@ -76,9 +76,3 @@ def build(env, source, target):
 test.must_match('build/log.txt', expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Split.py b/test/Split.py
index c0533fa08a..c7c92ee16b 100644
--- a/test/Split.py
+++ b/test/Split.py
@@ -61,9 +61,3 @@
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/AllowSubstExceptions.py b/test/Subst/AllowSubstExceptions.py
index 0332e6809a..6c35301cd2 100644
--- a/test/Subst/AllowSubstExceptions.py
+++ b/test/Subst/AllowSubstExceptions.py
@@ -95,9 +95,3 @@
 #print test.stdout()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/Literal.py b/test/Subst/Literal.py
index 33dd978e09..5312d48d0c 100644
--- a/test/Subst/Literal.py
+++ b/test/Subst/Literal.py
@@ -45,9 +45,3 @@
 test.run(arguments='-Q -q', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/SyntaxError.py b/test/Subst/SyntaxError.py
index 34fbc15702..7b9df9bd7f 100644
--- a/test/Subst/SyntaxError.py
+++ b/test/Subst/SyntaxError.py
@@ -72,9 +72,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/TypeError.py b/test/Subst/TypeError.py
index c52434f2df..174f559399 100644
--- a/test/Subst/TypeError.py
+++ b/test/Subst/TypeError.py
@@ -92,9 +92,3 @@ def func(a, b, c):
 test.run(status=2, stderr=r'.*TypeError\s:\sUser\scallable\sexception.*')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/bug3428.py b/test/Subst/bug3428.py
index 00587e6424..d17a5a741e 100644
--- a/test/Subst/bug3428.py
+++ b/test/Subst/bug3428.py
@@ -47,9 +47,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/null-sources-attr.py b/test/Subst/null-sources-attr.py
index 729aa99eb6..3544a41e68 100644
--- a/test/Subst/null-sources-attr.py
+++ b/test/Subst/null-sources-attr.py
@@ -61,9 +61,3 @@
 test.must_match('out2', "file1\nfile2\nfile3\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TAR/TAR.py b/test/TAR/TAR.py
index b05dc3bfe3..96b306d440 100644
--- a/test/TAR/TAR.py
+++ b/test/TAR/TAR.py
@@ -156,9 +156,3 @@ def process(outfile, name):
     test.fail_test(test.stdout() != "file22\nfile23\nfile24\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TAR/TARCOM.py b/test/TAR/TARCOM.py
index aaf7b6089f..40f7362e3a 100644
--- a/test/TAR/TARCOM.py
+++ b/test/TAR/TARCOM.py
@@ -52,9 +52,3 @@
 test.must_match('test1.tar', "test1.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TAR/TARCOMSTR.py b/test/TAR/TARCOMSTR.py
index 817dc59e2d..b86ac05715 100644
--- a/test/TAR/TARCOMSTR.py
+++ b/test/TAR/TARCOMSTR.py
@@ -53,9 +53,3 @@
 test.must_match('aaa.tar', "aaa.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TAR/TARFLAGS.py b/test/TAR/TARFLAGS.py
index 29a1866763..88247ce8fd 100644
--- a/test/TAR/TARFLAGS.py
+++ b/test/TAR/TARFLAGS.py
@@ -131,9 +131,3 @@ def process(outfile, name):
     test.fail_test(test.stdout() != "file13\nfile14\nfile15\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TARGET-dir.py b/test/TARGET-dir.py
index a3cb8da08f..badb352382 100644
--- a/test/TARGET-dir.py
+++ b/test/TARGET-dir.py
@@ -87,9 +87,3 @@ def cat(env, source, target):
 test.run(program = build2_foo, stdout = "foo.h.in\nfoo.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TARGETS.py b/test/TARGETS.py
index b67c97a547..0001f7885a 100644
--- a/test/TARGETS.py
+++ b/test/TARGETS.py
@@ -153,9 +153,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEMPFILE/TEMPFILE-actionlist.py b/test/TEMPFILE/TEMPFILE-actionlist.py
index d66b217187..89a34581d8 100644
--- a/test/TEMPFILE/TEMPFILE-actionlist.py
+++ b/test/TEMPFILE/TEMPFILE-actionlist.py
@@ -45,9 +45,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEMPFILE/TEMPFILEDIR.py b/test/TEMPFILE/TEMPFILEDIR.py
index b528be3b79..31920ea6b6 100644
--- a/test/TEMPFILE/TEMPFILEDIR.py
+++ b/test/TEMPFILE/TEMPFILEDIR.py
@@ -66,9 +66,3 @@
 # dirname = os.path.basename(os.path.dirname(tempfile))
 # test.fail_test('my_temp_files' != dirname, message="Temp file not created in \"my_temp_files\" directory")
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEMPFILE/TEMPFILEENCODING.py b/test/TEMPFILE/TEMPFILEENCODING.py
index 6a02f92f28..f33a6102dd 100644
--- a/test/TEMPFILE/TEMPFILEENCODING.py
+++ b/test/TEMPFILE/TEMPFILEENCODING.py
@@ -94,9 +94,3 @@
     )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEMPFILE/TEMPFILEPREFIX.py b/test/TEMPFILE/TEMPFILEPREFIX.py
index 3bda5eb172..efc604d10e 100644
--- a/test/TEMPFILE/TEMPFILEPREFIX.py
+++ b/test/TEMPFILE/TEMPFILEPREFIX.py
@@ -133,9 +133,3 @@ def _print_cmd_str(self, target, source, env, cmdstr):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEMPFILE/TEMPFILESUFFIX.py b/test/TEMPFILE/TEMPFILESUFFIX.py
index c44263ad3f..7bd7f9571e 100644
--- a/test/TEMPFILE/TEMPFILESUFFIX.py
+++ b/test/TEMPFILE/TEMPFILESUFFIX.py
@@ -104,9 +104,3 @@ def _print_cmd_str(self, target, source, env, cmdstr):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEX.py b/test/TEX/LATEX.py
index 94d8404d9d..220de2a6bb 100644
--- a/test/TEX/LATEX.py
+++ b/test/TEX/LATEX.py
@@ -219,9 +219,3 @@
     test.must_exist('latin1log.dvi')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py
index a7215e906b..13d2238448 100644
--- a/test/TEX/LATEX2.py
+++ b/test/TEX/LATEX2.py
@@ -125,9 +125,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEXCOM.py b/test/TEX/LATEXCOM.py
index 8ea87c84bf..8d0be58841 100644
--- a/test/TEX/LATEXCOM.py
+++ b/test/TEX/LATEXCOM.py
@@ -52,9 +52,3 @@
 test.must_match('test1.dvi', "test1.latex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEXCOMSTR.py b/test/TEX/LATEXCOMSTR.py
index de63ebfa33..e054a92af4 100644
--- a/test/TEX/LATEXCOMSTR.py
+++ b/test/TEX/LATEXCOMSTR.py
@@ -56,9 +56,3 @@
 test.must_match('test1.dvi', "test1.latex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEXFLAGS.py b/test/TEX/LATEXFLAGS.py
index 32e41dff0a..65d21b71d4 100644
--- a/test/TEX/LATEXFLAGS.py
+++ b/test/TEX/LATEXFLAGS.py
@@ -114,9 +114,3 @@
     test.fail_test(not os.path.exists(test.workpath('bar.dvi')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFLATEX.py b/test/TEX/PDFLATEX.py
index a350b28519..b336b2a26c 100644
--- a/test/TEX/PDFLATEX.py
+++ b/test/TEX/PDFLATEX.py
@@ -133,9 +133,3 @@
     test.must_exist('bar.pdf')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFLATEXCOM.py b/test/TEX/PDFLATEXCOM.py
index 5e9d68da39..9c6d37c0db 100644
--- a/test/TEX/PDFLATEXCOM.py
+++ b/test/TEX/PDFLATEXCOM.py
@@ -52,9 +52,3 @@
 test.must_match('test1.pdf', "test1.latex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFLATEXCOMSTR.py b/test/TEX/PDFLATEXCOMSTR.py
index f0e9467d5b..542bb0790b 100644
--- a/test/TEX/PDFLATEXCOMSTR.py
+++ b/test/TEX/PDFLATEXCOMSTR.py
@@ -56,9 +56,3 @@
 test.must_match('test1.pdf', "test1.latex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFLATEXFLAGS.py b/test/TEX/PDFLATEXFLAGS.py
index 9bea1f08e0..a959f8f6ff 100644
--- a/test/TEX/PDFLATEXFLAGS.py
+++ b/test/TEX/PDFLATEXFLAGS.py
@@ -115,9 +115,3 @@
     test.fail_test(not os.path.exists(test.workpath('bar.pdf')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFTEX.py b/test/TEX/PDFTEX.py
index 0309fcebe2..300f0016e4 100644
--- a/test/TEX/PDFTEX.py
+++ b/test/TEX/PDFTEX.py
@@ -118,9 +118,3 @@
     test.must_exist('bar.pdf')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFTEXCOM.py b/test/TEX/PDFTEXCOM.py
index fd0ba69144..06cdbcc1e2 100644
--- a/test/TEX/PDFTEXCOM.py
+++ b/test/TEX/PDFTEXCOM.py
@@ -52,9 +52,3 @@
 test.must_match('test1.pdf', "test1.tex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFTEXCOMSTR.py b/test/TEX/PDFTEXCOMSTR.py
index 30f3539264..4664f5ef14 100644
--- a/test/TEX/PDFTEXCOMSTR.py
+++ b/test/TEX/PDFTEXCOMSTR.py
@@ -56,9 +56,3 @@
 test.must_match('test1.pdf', "test1.tex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFTEXFLAGS.py b/test/TEX/PDFTEXFLAGS.py
index c9fcdcaa7f..0340fa4815 100644
--- a/test/TEX/PDFTEXFLAGS.py
+++ b/test/TEX/PDFTEXFLAGS.py
@@ -106,9 +106,3 @@
     test.must_exist(test.workpath('bar.pdf'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDF_single_source.py b/test/TEX/PDF_single_source.py
index cd11234f57..0f0f7d7033 100644
--- a/test/TEX/PDF_single_source.py
+++ b/test/TEX/PDF_single_source.py
@@ -135,9 +135,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py
index 278024c10d..b0a04b8c3f 100644
--- a/test/TEX/TEX.py
+++ b/test/TEX/TEX.py
@@ -185,9 +185,3 @@
         test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/TEXCOM.py b/test/TEX/TEXCOM.py
index 10da59ebe0..5a5e1cfecf 100644
--- a/test/TEX/TEXCOM.py
+++ b/test/TEX/TEXCOM.py
@@ -52,9 +52,3 @@
 test.must_match('test1.dvi', "test1.tex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/TEXCOMSTR.py b/test/TEX/TEXCOMSTR.py
index c41de6d191..4ec1f0d3f9 100644
--- a/test/TEX/TEXCOMSTR.py
+++ b/test/TEX/TEXCOMSTR.py
@@ -58,9 +58,3 @@
 test.must_match('test1.dvi', "test1.tex\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/TEXFLAGS.py b/test/TEX/TEXFLAGS.py
index fe19fec54d..1019e47ae8 100644
--- a/test/TEX/TEXFLAGS.py
+++ b/test/TEX/TEXFLAGS.py
@@ -105,9 +105,3 @@
     test.fail_test(not os.path.exists(test.workpath('bar.dvi')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/auxiliaries.py b/test/TEX/auxiliaries.py
index 1e37e7a2fc..c74b860b70 100644
--- a/test/TEX/auxiliaries.py
+++ b/test/TEX/auxiliaries.py
@@ -167,9 +167,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/bibliography.py b/test/TEX/bibliography.py
index 122a0d6390..9d67791d00 100644
--- a/test/TEX/bibliography.py
+++ b/test/TEX/bibliography.py
@@ -210,9 +210,3 @@
 \listoftables
 \cleardoublepage
 """)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/bibtex-latex-rerun.py b/test/TEX/bibtex-latex-rerun.py
index 7334f1eabc..1b309130cd 100644
--- a/test/TEX/bibtex-latex-rerun.py
+++ b/test/TEX/bibtex-latex-rerun.py
@@ -131,9 +131,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/clean.py b/test/TEX/clean.py
index 4cae61daf6..cc7da9188b 100644
--- a/test/TEX/clean.py
+++ b/test/TEX/clean.py
@@ -100,9 +100,3 @@
 test.must_not_exist('foo.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/configure.py b/test/TEX/configure.py
index 31bec050a8..81d2b2e1c6 100644
--- a/test/TEX/configure.py
+++ b/test/TEX/configure.py
@@ -86,9 +86,3 @@ def CheckLModern(context):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/dryrun.py b/test/TEX/dryrun.py
index 4dc12e4e35..ed52544843 100644
--- a/test/TEX/dryrun.py
+++ b/test/TEX/dryrun.py
@@ -61,9 +61,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/eps_graphics.py b/test/TEX/eps_graphics.py
index 9e36148e0c..c8b5567879 100644
--- a/test/TEX/eps_graphics.py
+++ b/test/TEX/eps_graphics.py
@@ -185,9 +185,3 @@
 test.must_not_exist(['docs/Fig1.pdf',])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/glossaries.py b/test/TEX/glossaries.py
index d418ee266e..42a3387de2 100644
--- a/test/TEX/glossaries.py
+++ b/test/TEX/glossaries.py
@@ -109,12 +109,3 @@
 test.must_not_exist(test.workpath('glossaries.pdf'))
 
 test.pass_test()
-
-
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/glossary.py b/test/TEX/glossary.py
index d4ab579c24..b31cc29f68 100644
--- a/test/TEX/glossary.py
+++ b/test/TEX/glossary.py
@@ -96,12 +96,3 @@
 test.must_not_exist(test.workpath('gloassary.dvi'))
 
 test.pass_test()
-
-
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/input_docClass.py b/test/TEX/input_docClass.py
index 413cba5de2..af1e727ad2 100644
--- a/test/TEX/input_docClass.py
+++ b/test/TEX/input_docClass.py
@@ -88,9 +88,3 @@
 test.run(arguments = '.', stderr=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/lstinputlisting.py b/test/TEX/lstinputlisting.py
index 40f935bdf1..6263c93864 100644
--- a/test/TEX/lstinputlisting.py
+++ b/test/TEX/lstinputlisting.py
@@ -129,9 +129,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/makeindex.py b/test/TEX/makeindex.py
index 0b81f31e37..8903fc52b5 100644
--- a/test/TEX/makeindex.py
+++ b/test/TEX/makeindex.py
@@ -102,9 +102,3 @@
 test.must_not_exist(test.workpath('no_index.aux'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/multi-line_include_options.py b/test/TEX/multi-line_include_options.py
index 94466b671d..e187eb4b7f 100644
--- a/test/TEX/multi-line_include_options.py
+++ b/test/TEX/multi-line_include_options.py
@@ -81,10 +81,3 @@
 test.must_exist(test.workpath('root.log'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
-
diff --git a/test/TEX/multi-run.py b/test/TEX/multi-run.py
index 29b8f1fdaf..2282946fa3 100644
--- a/test/TEX/multi-run.py
+++ b/test/TEX/multi-run.py
@@ -217,9 +217,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/multiple_include.py b/test/TEX/multiple_include.py
index 8817c94031..87f5c45987 100644
--- a/test/TEX/multiple_include.py
+++ b/test/TEX/multiple_include.py
@@ -233,9 +233,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/multiple_include_subdir.py b/test/TEX/multiple_include_subdir.py
index 980a79caa4..6bac81c3b0 100644
--- a/test/TEX/multiple_include_subdir.py
+++ b/test/TEX/multiple_include_subdir.py
@@ -233,9 +233,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/newglossary.py b/test/TEX/newglossary.py
index 37e5c26735..0789e04b5e 100644
--- a/test/TEX/newglossary.py
+++ b/test/TEX/newglossary.py
@@ -150,12 +150,3 @@
 test.must_not_exist(test.workpath('newglossary.symo'))
 
 test.pass_test()
-
-
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/nomencl.py b/test/TEX/nomencl.py
index 9cbced7849..cf441ff608 100644
--- a/test/TEX/nomencl.py
+++ b/test/TEX/nomencl.py
@@ -102,12 +102,3 @@
 test.must_not_exist(test.workpath('nomencl.pdf'))
 
 test.pass_test()
-
-
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/recursive_scanner_dependencies_import.py b/test/TEX/recursive_scanner_dependencies_import.py
index 7b6cb65a85..0253deef7c 100644
--- a/test/TEX/recursive_scanner_dependencies_import.py
+++ b/test/TEX/recursive_scanner_dependencies_import.py
@@ -120,9 +120,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/recursive_scanner_dependencies_input.py b/test/TEX/recursive_scanner_dependencies_input.py
index 5afcbc2614..48c02da9db 100644
--- a/test/TEX/recursive_scanner_dependencies_input.py
+++ b/test/TEX/recursive_scanner_dependencies_input.py
@@ -105,9 +105,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/rename_result.py b/test/TEX/rename_result.py
index 5d9f1b0368..0510acc6f5 100644
--- a/test/TEX/rename_result.py
+++ b/test/TEX/rename_result.py
@@ -72,9 +72,3 @@
 test.must_not_exist('bar.pdf')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/subdir-as-include.py b/test/TEX/subdir-as-include.py
index bb3f2e5f50..64d29f52b0 100755
--- a/test/TEX/subdir-as-include.py
+++ b/test/TEX/subdir-as-include.py
@@ -70,9 +70,3 @@
 test.must_exist(test.workpath('root.log'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/subdir-input.py b/test/TEX/subdir-input.py
index 0d9311e090..d3d2d4662f 100644
--- a/test/TEX/subdir-input.py
+++ b/test/TEX/subdir-input.py
@@ -88,9 +88,3 @@
 test.not_up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/subdir_variantdir_include.py b/test/TEX/subdir_variantdir_include.py
index 784533a18e..905844d9d3 100644
--- a/test/TEX/subdir_variantdir_include.py
+++ b/test/TEX/subdir_variantdir_include.py
@@ -134,9 +134,3 @@
 #test.up_to_date(arguments = '.', stderr=None, stdout=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/subdir_variantdir_include2.py b/test/TEX/subdir_variantdir_include2.py
index 2b615f194d..e7390e4558 100644
--- a/test/TEX/subdir_variantdir_include2.py
+++ b/test/TEX/subdir_variantdir_include2.py
@@ -139,9 +139,3 @@
 #test.up_to_date(arguments = '.', stderr=None, stdout=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/subdir_variantdir_input.py b/test/TEX/subdir_variantdir_input.py
index 679434e55b..44fc3b2943 100644
--- a/test/TEX/subdir_variantdir_input.py
+++ b/test/TEX/subdir_variantdir_input.py
@@ -128,9 +128,3 @@
 #test.up_to_date(arguments = '.', stderr=None, stdout=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/synctex.py b/test/TEX/synctex.py
index c9552d548b..e92fea6d52 100644
--- a/test/TEX/synctex.py
+++ b/test/TEX/synctex.py
@@ -77,12 +77,3 @@
 test.must_not_exist(test.workpath('mysync.pdf'))
 
 test.pass_test()
-
-
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/usepackage.py b/test/TEX/usepackage.py
index 34d22b35f9..20d059a0d7 100644
--- a/test/TEX/usepackage.py
+++ b/test/TEX/usepackage.py
@@ -68,9 +68,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/variant_dir.py b/test/TEX/variant_dir.py
index 1db3768937..618109db1c 100644
--- a/test/TEX/variant_dir.py
+++ b/test/TEX/variant_dir.py
@@ -265,9 +265,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/variant_dir_bibunit.py b/test/TEX/variant_dir_bibunit.py
index 0d286300ac..751462af32 100644
--- a/test/TEX/variant_dir_bibunit.py
+++ b/test/TEX/variant_dir_bibunit.py
@@ -271,9 +271,3 @@
     test.must_not_exist(['build', f])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/variant_dir_dup0.py b/test/TEX/variant_dir_dup0.py
index cc2e0f635b..a025822e8a 100644
--- a/test/TEX/variant_dir_dup0.py
+++ b/test/TEX/variant_dir_dup0.py
@@ -326,9 +326,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/variant_dir_style_dup0.py b/test/TEX/variant_dir_style_dup0.py
index c12e7bb631..065913d168 100644
--- a/test/TEX/variant_dir_style_dup0.py
+++ b/test/TEX/variant_dir_style_dup0.py
@@ -181,9 +181,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TaskMaster/bug_2811/issue_2811_emitter_more_than_one_target_generated_source_false_rebuilds.py b/test/TaskMaster/bug_2811/issue_2811_emitter_more_than_one_target_generated_source_false_rebuilds.py
index 8f2f32884c..6d5f348e2a 100644
--- a/test/TaskMaster/bug_2811/issue_2811_emitter_more_than_one_target_generated_source_false_rebuilds.py
+++ b/test/TaskMaster/bug_2811/issue_2811_emitter_more_than_one_target_generated_source_false_rebuilds.py
@@ -46,9 +46,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ToolSurrogate.py b/test/ToolSurrogate.py
index a297056bd7..ce65481288 100644
--- a/test/ToolSurrogate.py
+++ b/test/ToolSurrogate.py
@@ -103,9 +103,3 @@ def Cat(target, source, env):
 """))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Touch.py b/test/Touch.py
index e3619466aa..b28012b4f0 100644
--- a/test/Touch.py
+++ b/test/Touch.py
@@ -124,9 +124,3 @@ def cat(env, source, target):
 test.must_exist(test.workpath('f8'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ValidateOptions.py b/test/ValidateOptions.py
index 5dff386e26..713c6f48de 100644
--- a/test/ValidateOptions.py
+++ b/test/ValidateOptions.py
@@ -82,9 +82,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Value/GetContent.py b/test/Value/GetContent.py
index 30e30df865..1eb7716b18 100644
--- a/test/Value/GetContent.py
+++ b/test/Value/GetContent.py
@@ -48,9 +48,3 @@ def null_build(target, source, env):
 
 test.run()
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Value/Value.py b/test/Value/Value.py
index 2995364201..5d67202baf 100644
--- a/test/Value/Value.py
+++ b/test/Value/Value.py
@@ -150,9 +150,3 @@ def create_value_file(target, source, env):
     test.must_match('f5.out', "C=/var")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/BoolVariable.py b/test/Variables/BoolVariable.py
index aa01a30a14..6c967b4670 100644
--- a/test/Variables/BoolVariable.py
+++ b/test/Variables/BoolVariable.py
@@ -72,9 +72,3 @@ def check(expect):
 test.run(arguments='warnings=irgendwas', stderr=expect_stderr, status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/EnumVariable.py b/test/Variables/EnumVariable.py
index 48f24081c9..8627a34232 100644
--- a/test/Variables/EnumVariable.py
+++ b/test/Variables/EnumVariable.py
@@ -98,9 +98,3 @@ def check(expect):
 check(['no', 'gtk', 'zwei wörter'])  # case-lowering converter
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/ListVariable.py b/test/Variables/ListVariable.py
index d6356e822b..0d01057695 100644
--- a/test/Variables/ListVariable.py
+++ b/test/Variables/ListVariable.py
@@ -191,9 +191,3 @@ def check(expected):
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/PackageVariable.py b/test/Variables/PackageVariable.py
index 77c04e6088..7ad16903b6 100644
--- a/test/Variables/PackageVariable.py
+++ b/test/Variables/PackageVariable.py
@@ -111,9 +111,3 @@ def check(expect: list[str]) -> None:
 check([tinycbor_path])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/PathVariable.py b/test/Variables/PathVariable.py
index af9efd3281..de0db5822f 100644
--- a/test/Variables/PathVariable.py
+++ b/test/Variables/PathVariable.py
@@ -282,9 +282,3 @@ def check(expect):
 test.must_exist(non_existing_subdir)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/Variables.py b/test/Variables/Variables.py
index e8a1873705..48dbfdad40 100644
--- a/test/Variables/Variables.py
+++ b/test/Variables/Variables.py
@@ -377,9 +377,3 @@ def compare(a, b):
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/chdir.py b/test/Variables/chdir.py
index 04e10dea54..8546de2ef3 100644
--- a/test/Variables/chdir.py
+++ b/test/Variables/chdir.py
@@ -70,9 +70,3 @@
 test.run(arguments='-q -Q .', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/help.py b/test/Variables/help.py
index e0addb19d2..890b76e13c 100644
--- a/test/Variables/help.py
+++ b/test/Variables/help.py
@@ -152,9 +152,3 @@
 """ % locals())
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/import.py b/test/Variables/import.py
index 85c75fd39c..f714ff3097 100644
--- a/test/Variables/import.py
+++ b/test/Variables/import.py
@@ -66,9 +66,3 @@
 test.run(arguments='-q -Q .', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/CPPPATH-subdir.py b/test/VariantDir/CPPPATH-subdir.py
index 2f410944e4..25ebb40103 100644
--- a/test/VariantDir/CPPPATH-subdir.py
+++ b/test/VariantDir/CPPPATH-subdir.py
@@ -69,9 +69,3 @@
          match = TestSCons.match_re_dotall)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/Clean.py b/test/VariantDir/Clean.py
index 1fc1269c3e..51ee7f327b 100644
--- a/test/VariantDir/Clean.py
+++ b/test/VariantDir/Clean.py
@@ -70,9 +70,3 @@ def build_sample(target, source, env):
 test.must_not_exist(['build', 'sample.junk'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/File-create.py b/test/VariantDir/File-create.py
index ad9234bfa0..fb267216cf 100644
--- a/test/VariantDir/File-create.py
+++ b/test/VariantDir/File-create.py
@@ -70,9 +70,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/SConscript-variant_dir.py b/test/VariantDir/SConscript-variant_dir.py
index 36198ceda2..b39a5c956a 100644
--- a/test/VariantDir/SConscript-variant_dir.py
+++ b/test/VariantDir/SConscript-variant_dir.py
@@ -269,9 +269,3 @@ def equal_stats(x,y):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/VariantDir.py b/test/VariantDir/VariantDir.py
index 8e1a89b9c0..1d1ebb8b17 100644
--- a/test/VariantDir/VariantDir.py
+++ b/test/VariantDir/VariantDir.py
@@ -409,9 +409,3 @@ def equal_stats(x,y):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/errors.py b/test/VariantDir/errors.py
index b50eb318c7..3edb16a717 100644
--- a/test/VariantDir/errors.py
+++ b/test/VariantDir/errors.py
@@ -170,9 +170,3 @@ def cat(env, source, target):
          stderr = expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/guess-subdir.py b/test/VariantDir/guess-subdir.py
index 294253bb7d..672e157088 100644
--- a/test/VariantDir/guess-subdir.py
+++ b/test/VariantDir/guess-subdir.py
@@ -67,9 +67,3 @@
 test.must_exist(test.workpath('debug', 'src', 'test.exe'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/include-subdir.py b/test/VariantDir/include-subdir.py
index fe26c0a724..6ccb8477a3 100644
--- a/test/VariantDir/include-subdir.py
+++ b/test/VariantDir/include-subdir.py
@@ -74,9 +74,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/nested-sconscripts.py b/test/VariantDir/nested-sconscripts.py
index 8782e415b4..c1d1557bf0 100644
--- a/test/VariantDir/nested-sconscripts.py
+++ b/test/VariantDir/nested-sconscripts.py
@@ -62,9 +62,3 @@
 test.run(chdir='src')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/no-execute.py b/test/VariantDir/no-execute.py
index e9a4c487b1..158cb76d90 100644
--- a/test/VariantDir/no-execute.py
+++ b/test/VariantDir/no-execute.py
@@ -87,9 +87,3 @@
 test.must_match(['build1', 'file.out'], "a/file.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/reflect.py b/test/VariantDir/reflect.py
index 56b0c182b2..011839497f 100644
--- a/test/VariantDir/reflect.py
+++ b/test/VariantDir/reflect.py
@@ -134,9 +134,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/removed-files.py b/test/VariantDir/removed-files.py
index 113f667601..9f1674052a 100644
--- a/test/VariantDir/removed-files.py
+++ b/test/VariantDir/removed-files.py
@@ -97,9 +97,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/under.py b/test/VariantDir/under.py
index 2508db5804..355f2b395f 100644
--- a/test/VariantDir/under.py
+++ b/test/VariantDir/under.py
@@ -92,9 +92,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/WhereIs.py b/test/WhereIs.py
index bb7ac405b2..00dc15b2ac 100644
--- a/test/WhereIs.py
+++ b/test/WhereIs.py
@@ -140,9 +140,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/bad-drive.py b/test/Win32/bad-drive.py
index cca54620d6..b42073c2c0 100644
--- a/test/Win32/bad-drive.py
+++ b/test/Win32/bad-drive.py
@@ -104,9 +104,3 @@ def cat(env, source, target):
 test.run(arguments='ddd.out', stderr=expect, status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/default-drive.py b/test/Win32/default-drive.py
index e1d8d4bf62..d71b1d3d48 100644
--- a/test/Win32/default-drive.py
+++ b/test/Win32/default-drive.py
@@ -64,9 +64,3 @@ def cat(env, source, target):
 test.must_match(['build', 'file.out'], "src/file.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/file-is-type-not-func.py b/test/Win32/file-is-type-not-func.py
index bcf8339694..80229efef1 100644
--- a/test/Win32/file-is-type-not-func.py
+++ b/test/Win32/file-is-type-not-func.py
@@ -50,9 +50,3 @@ class AFile(file): pass
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/mingw.py b/test/Win32/mingw.py
index aca8795c7f..fdc0e42f08 100644
--- a/test/Win32/mingw.py
+++ b/test/Win32/mingw.py
@@ -207,9 +207,3 @@
 test.run(program=test.workpath('test.exe'), stdout='test.cpp2\nshared.cpp2\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/msvc_mingw_env.py b/test/Win32/msvc_mingw_env.py
index f278cfaf9a..b48e0d82ab 100644
--- a/test/Win32/msvc_mingw_env.py
+++ b/test/Win32/msvc_mingw_env.py
@@ -51,7 +51,7 @@
 if 'CCFLAGS=/nologo' not in test.stdout() or 'CC=cl' not in test.stdout():
     test.fail_test()
 
-# make sure windows msvc doesnt add bad mingw flags 
+# make sure windows msvc doesnt add bad mingw flags
 # and that gcc is selected
 test.write('SConstruct',"""
 DefaultEnvironment(tools=[])
@@ -96,9 +96,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/scons-bat-error.py b/test/Win32/scons-bat-error.py
index d772132a9d..d39858b829 100644
--- a/test/Win32/scons-bat-error.py
+++ b/test/Win32/scons-bat-error.py
@@ -82,9 +82,3 @@ def main():
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/win32pathmadness.py b/test/Win32/win32pathmadness.py
index 925a323b69..303f6afb86 100644
--- a/test/Win32/win32pathmadness.py
+++ b/test/Win32/win32pathmadness.py
@@ -24,7 +24,7 @@
 
 """
 This test verifies that the build command signatures do not depend on
-the case of the drive letter on Windows. This is important because Windows is 
+the case of the drive letter on Windows. This is important because Windows is
 inconsistent about which case is used for the drive letter.
 """
 
@@ -49,30 +49,30 @@
 """)
 
 test.write('src/foo.c', """
-int foo(void) 
-{ 
+int foo(void)
+{
     return 1;
 }
 """)
 
 test.write('src/bar.c', """
-__declspec(dllexport) int bar(void) 
-{ 
+__declspec(dllexport) int bar(void)
+{
     return 1;
 }
 """)
 
 test.write('src/main.c', """
 #include <bar.h>
-int main(void) 
-{ 
+int main(void)
+{
     return 1;
 }
 """)
 
 test.write('src2/blat.c', """
-int blat(void) 
-{ 
+int blat(void)
+{
     return 1;
 }
 """)
@@ -141,9 +141,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/BISONFLAGS.py b/test/YACC/BISONFLAGS.py
index 9b8cf0301f..e4312786ac 100644
--- a/test/YACC/BISONFLAGS.py
+++ b/test/YACC/BISONFLAGS.py
@@ -165,9 +165,3 @@ def check(targets, expected):
 test.must_not_exist(test.workpath('sub2', 'graph.g'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACC.py b/test/YACC/YACC.py
index a5b290cd69..3434c10756 100644
--- a/test/YACC/YACC.py
+++ b/test/YACC/YACC.py
@@ -66,9 +66,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCCOM.py b/test/YACC/YACCCOM.py
index cc30ca787e..f356e77b97 100644
--- a/test/YACC/YACCCOM.py
+++ b/test/YACC/YACCCOM.py
@@ -54,9 +54,3 @@
 test.must_match('bbb.c', "bbb.yacc\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCCOMSTR.py b/test/YACC/YACCCOMSTR.py
index de26025a36..2ebac1f629 100644
--- a/test/YACC/YACCCOMSTR.py
+++ b/test/YACC/YACCCOMSTR.py
@@ -59,9 +59,3 @@
 test.must_match('bbb.c', "bbb.yacc\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCFLAGS.py b/test/YACC/YACCFLAGS.py
index f7a3cfbe24..28d2540d1e 100644
--- a/test/YACC/YACCFLAGS.py
+++ b/test/YACC/YACCFLAGS.py
@@ -59,9 +59,3 @@
 test.must_match(['out', 'aaa.c'], "aaa.y\n-x\nout in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCHFILESUFFIX.py b/test/YACC/YACCHFILESUFFIX.py
index e37bd667e5..ddb57635ac 100644
--- a/test/YACC/YACCHFILESUFFIX.py
+++ b/test/YACC/YACCHFILESUFFIX.py
@@ -79,9 +79,3 @@
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCHXXFILESUFFIX.py b/test/YACC/YACCHXXFILESUFFIX.py
index 3028d70345..57ce5fda84 100644
--- a/test/YACC/YACCHXXFILESUFFIX.py
+++ b/test/YACC/YACCHXXFILESUFFIX.py
@@ -75,9 +75,3 @@
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCVCGFILESUFFIX.py b/test/YACC/YACCVCGFILESUFFIX.py
index 2fb953b0a8..796208b2fc 100644
--- a/test/YACC/YACCVCGFILESUFFIX.py
+++ b/test/YACC/YACCVCGFILESUFFIX.py
@@ -84,9 +84,3 @@
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACC_GRAPH_FILE_SUFFIX.py b/test/YACC/YACC_GRAPH_FILE_SUFFIX.py
index 58e7628533..1024ac157d 100644
--- a/test/YACC/YACC_GRAPH_FILE_SUFFIX.py
+++ b/test/YACC/YACC_GRAPH_FILE_SUFFIX.py
@@ -88,9 +88,3 @@
 test.up_to_date(arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/live-check-output-cleaned.py b/test/YACC/live-check-output-cleaned.py
index b4914a892e..c68f433d9f 100644
--- a/test/YACC/live-check-output-cleaned.py
+++ b/test/YACC/live-check-output-cleaned.py
@@ -88,9 +88,3 @@
 test.must_not_exist(test.workpath('foo.c'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/live.py b/test/YACC/live.py
index e1393cffe2..b2dd29fb15 100644
--- a/test/YACC/live.py
+++ b/test/YACC/live.py
@@ -164,9 +164,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ZIP/ZIP.py b/test/ZIP/ZIP.py
index 69f524e152..268d280613 100644
--- a/test/ZIP/ZIP.py
+++ b/test/ZIP/ZIP.py
@@ -126,9 +126,3 @@ def marker(target, source, env):
 test.fail_test(f4stored_size == f4deflated_size)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ZIP/ZIPCOM.py b/test/ZIP/ZIPCOM.py
index c6c1412f43..86b27d1b97 100644
--- a/test/ZIP/ZIPCOM.py
+++ b/test/ZIP/ZIPCOM.py
@@ -49,9 +49,3 @@
 test.must_match('test1.zip', "test1.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ZIP/ZIPCOMSTR.py b/test/ZIP/ZIPCOMSTR.py
index 43566fb237..f1974b5907 100644
--- a/test/ZIP/ZIPCOMSTR.py
+++ b/test/ZIP/ZIPCOMSTR.py
@@ -62,9 +62,3 @@
 test.must_match('aaa.zip', "aaa.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/_CPPINCFLAGS.py b/test/_CPPINCFLAGS.py
index 8bb8261e18..b6eb7d6914 100644
--- a/test/_CPPINCFLAGS.py
+++ b/test/_CPPINCFLAGS.py
@@ -51,9 +51,3 @@
 test.run(arguments = '-Q -q', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/bad-variables.py b/test/bad-variables.py
index 06f106447c..3cab524e1d 100644
--- a/test/bad-variables.py
+++ b/test/bad-variables.py
@@ -67,9 +67,3 @@
 test.run(arguments='.', status=2, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/builderrors.py b/test/builderrors.py
index 4cdd1c1e0d..16f1516290 100644
--- a/test/builderrors.py
+++ b/test/builderrors.py
@@ -209,9 +209,3 @@ def print_build_failures():
 
 # No tests failed; OK.
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/chained-build.py b/test/chained-build.py
index 2cc3106771..b5c7a36e8f 100644
--- a/test/chained-build.py
+++ b/test/chained-build.py
@@ -97,9 +97,3 @@ def build(env, target, source):
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/chdir.py b/test/chdir.py
index 696488b703..8f67f18184 100644
--- a/test/chdir.py
+++ b/test/chdir.py
@@ -276,9 +276,3 @@
 test.must_match(work2_sub_f2_out, "work2/sub/f2.in")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/custom-concat.py b/test/custom-concat.py
index 730e6cdb21..5bea55c229 100644
--- a/test/custom-concat.py
+++ b/test/custom-concat.py
@@ -52,9 +52,3 @@ def my_concat1(pref, list, suff, env, f=None):
 test.run(arguments = '.', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/dependency-cycle.py b/test/dependency-cycle.py
index a555d76ba4..6f494ff284 100644
--- a/test/dependency-cycle.py
+++ b/test/dependency-cycle.py
@@ -45,7 +45,7 @@
 f1(void)
 {
         printf("f1.c\n");
-} 
+}
 """)
 
 test.run(arguments = ".", stderr=r"""
@@ -60,10 +60,3 @@
 
 
 test.pass_test()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/diskcheck.py b/test/diskcheck.py
index c07dc6b344..70d2eb1630 100644
--- a/test/diskcheck.py
+++ b/test/diskcheck.py
@@ -60,9 +60,3 @@
 test.run(arguments='setoption_none=1')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/duplicate-sources.py b/test/duplicate-sources.py
index 48a106dc53..5a5ceb5bbd 100644
--- a/test/duplicate-sources.py
+++ b/test/duplicate-sources.py
@@ -53,9 +53,3 @@ def cat(target, source, env):
 test.up_to_date(options='--debug=explain', arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/emitter.py b/test/emitter.py
index e454dc7110..d92f780183 100644
--- a/test/emitter.py
+++ b/test/emitter.py
@@ -99,9 +99,3 @@ def emit2(t, s, e): return (t + ['emit.2'], s)
 test.must_exist(test.workpath('src', 'emit.2'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/exceptions.py b/test/exceptions.py
index 842959abac..f249191977 100644
--- a/test/exceptions.py
+++ b/test/exceptions.py
@@ -118,9 +118,3 @@ def func(source = None, target = None, env = None):
 test.must_contain_all_lines(test.stderr(), expected_stderr_list)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/exitfns.py b/test/exitfns.py
index ee2ada1945..2909a69307 100644
--- a/test/exitfns.py
+++ b/test/exitfns.py
@@ -27,7 +27,7 @@
 import TestSCons
 test = TestSCons.TestSCons()
 
-# also exclude these tests since it overides the exit function which doesnt work with coverage 
+# also exclude these tests since it overides the exit function which doesnt work with coverage
 # # more info here: https://coverage.readthedocs.io/en/coverage-4.4.2/subprocess.html#
 # TODO: figure out how to cover tests which use exit functions
 if test.coverage_run():
@@ -73,9 +73,3 @@ def f():
 test.run(arguments='-f SConstruct .', stdout = expected_output)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/expansion.py b/test/expansion.py
index 80c9706254..b438ff4ae4 100644
--- a/test/expansion.py
+++ b/test/expansion.py
@@ -113,9 +113,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/alias-order.py b/test/explain/alias-order.py
index bdb815417c..642c5376d1 100644
--- a/test/explain/alias-order.py
+++ b/test/explain/alias-order.py
@@ -80,9 +80,3 @@ def action( source, target, env ):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/basic.py b/test/explain/basic.py
index 6d41496fdb..31f31b234e 100644
--- a/test/explain/basic.py
+++ b/test/explain/basic.py
@@ -440,9 +440,3 @@ def WriteInitialTest( valueDict ) :
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/function-actions.py b/test/explain/function-actions.py
index 076b24e50a..46ed47a1c5 100644
--- a/test/explain/function-actions.py
+++ b/test/explain/function-actions.py
@@ -96,9 +96,3 @@ def ChangingCopy(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/get_csig.py b/test/explain/get_csig.py
index b193797997..618549af05 100644
--- a/test/explain/get_csig.py
+++ b/test/explain/get_csig.py
@@ -74,9 +74,3 @@ def action( source, target, env ):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/save-info.py b/test/explain/save-info.py
index 500bb55546..d2078d2a98 100644
--- a/test/explain/save-info.py
+++ b/test/explain/save-info.py
@@ -205,9 +205,3 @@ def kfile_scan(node, env, target, arg):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/file-names.py b/test/file-names.py
index baafbee814..99fe2ac603 100644
--- a/test/file-names.py
+++ b/test/file-names.py
@@ -75,7 +75,7 @@ def invalid_trailing_char(c):
     invalid_chars.add(chr(92)) # forward slash (dirsep)
     invalid_chars.add(chr(96)) # backtick
 
-    
+
     def bad_char(c):
         return c in invalid_chars
     def invalid_leading_char(c):
@@ -125,9 +125,3 @@ def create_command(a, b, c):
         test.must_match("out" + c_str, contents(c))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/gettext/MOFiles/UserExamples.py b/test/gettext/MOFiles/UserExamples.py
index 4dcaa2ebbe..574fad8674 100644
--- a/test/gettext/MOFiles/UserExamples.py
+++ b/test/gettext/MOFiles/UserExamples.py
@@ -228,10 +228,3 @@
 test.must_exist(['ex4', 'pl.mo'])
 
 test.pass_test()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/gettext/POInit/UserExamples.py b/test/gettext/POInit/UserExamples.py
index a701851f73..e74bf8f80c 100644
--- a/test/gettext/POInit/UserExamples.py
+++ b/test/gettext/POInit/UserExamples.py
@@ -193,7 +193,7 @@
 env['POAUTOINIT'] = 1
 env['LINGUAS_FILE'] = 1
 env['POTDOMAIN'] = 'foo'
-env.POInit() 
+env.POInit()
 """)
 test.write(['ex6', 'LINGUAS'],"""
 en
@@ -212,10 +212,3 @@
 test.must_contain(  ['ex6', 'pl.po'], "Hello from a.cpp", mode='r')
 
 test.pass_test()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/gettext/POTUpdate/UserExamples.py b/test/gettext/POTUpdate/UserExamples.py
index a3075ebca1..de628b5bf6 100644
--- a/test/gettext/POTUpdate/UserExamples.py
+++ b/test/gettext/POTUpdate/UserExamples.py
@@ -214,9 +214,3 @@
                         'Hello from ../a.cpp', mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/gettext/POUpdate/UserExamples.py b/test/gettext/POUpdate/UserExamples.py
index 00b2e0c21e..3724d8b8c9 100644
--- a/test/gettext/POUpdate/UserExamples.py
+++ b/test/gettext/POUpdate/UserExamples.py
@@ -392,10 +392,3 @@
 test.must_contain(['ex8', 'pl.po'], "Hello from a.cpp", mode='r')
 
 test.pass_test()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/gettext/Translate/MultiCatalog.py b/test/gettext/Translate/MultiCatalog.py
index e8c2b97c75..acfcf97f31 100644
--- a/test/gettext/Translate/MultiCatalog.py
+++ b/test/gettext/Translate/MultiCatalog.py
@@ -26,11 +26,11 @@
 
 """
 Ensure that projects with multiple translation catalogs maintain translation
-files correctly. 
+files correctly.
 """
 
 # There was a bug that affected the `Translate()` when no targets were provided
-# explicitelly via argument list. If, for exapmle, `pkg1/SConscript` and 
+# explicitelly via argument list. If, for exapmle, `pkg1/SConscript` and
 # `pkg2/SConscript` scripts in some project `p1` had:
 #
 #       Translate(LINGUAS_FILE = 1)
@@ -111,9 +111,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/gettext/Translate/UserExamples.py b/test/gettext/Translate/UserExamples.py
index d7220a3d9c..56ac90a268 100644
--- a/test/gettext/Translate/UserExamples.py
+++ b/test/gettext/Translate/UserExamples.py
@@ -171,9 +171,3 @@
 test.must_not_exist(    ['ex3', 'src', 'po', 'pl.mo'] )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/gnutools.py b/test/gnutools.py
index eb0d847613..08a78a8922 100644
--- a/test/gnutools.py
+++ b/test/gnutools.py
@@ -149,9 +149,3 @@ def testObject(test, obj, expect):
 testObject(test, dll('c-and-cpp'),      b'g++ -shared')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ignore-command.py b/test/ignore-command.py
index 3833e61874..1e37daf721 100644
--- a/test/ignore-command.py
+++ b/test/ignore-command.py
@@ -80,9 +80,3 @@
 test.must_match('f1.out', "f1.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit-cache/DualTargets.py b/test/implicit-cache/DualTargets.py
index 174d39c149..da0be408ea 100644
--- a/test/implicit-cache/DualTargets.py
+++ b/test/implicit-cache/DualTargets.py
@@ -133,9 +133,3 @@ def source_scan(node, env, path):
 
 # Then only of the targets using --implicit-cache
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit-cache/GetOption.py b/test/implicit-cache/GetOption.py
index 561c21ba3f..025750b398 100644
--- a/test/implicit-cache/GetOption.py
+++ b/test/implicit-cache/GetOption.py
@@ -53,9 +53,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit-cache/SetOption.py b/test/implicit-cache/SetOption.py
index d98ff8b532..eec45cc5c4 100644
--- a/test/implicit-cache/SetOption.py
+++ b/test/implicit-cache/SetOption.py
@@ -69,9 +69,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit-cache/basic.py b/test/implicit-cache/basic.py
index aa25327f97..86787a7d84 100644
--- a/test/implicit-cache/basic.py
+++ b/test/implicit-cache/basic.py
@@ -335,9 +335,3 @@ def copy(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
index bec2255977..6e4ec826ef 100644
--- a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
+++ b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
@@ -32,7 +32,7 @@
 
 import TestSCons
 
-# swap slashes because on py3 on win32 inside the generated build.py 
+# swap slashes because on py3 on win32 inside the generated build.py
 # the backslashes are getting interpretted as unicode which is
 # invalid.
 python = TestSCons.python.replace('\\','//')
@@ -150,9 +150,3 @@ def run_test(extra, python, _python_):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit/asynchronous-modification.py b/test/implicit/asynchronous-modification.py
index 1a409aef61..b91c63c936 100644
--- a/test/implicit/asynchronous-modification.py
+++ b/test/implicit/asynchronous-modification.py
@@ -40,7 +40,7 @@
 test.write(['SConstruct'], """\
 import SCons.Defaults
 DefaultEnvironment(tools=[])
-env = Environment(tools=[]) 
+env = Environment(tools=[])
 env['BUILDERS']['C'] = Builder(action = Copy('$TARGET', '$SOURCE'),
                                source_scanner = SCons.Defaults.CScan)
 env['BUILDERS']['Mod'] = Builder(action = r'%(_python_)s mod.py')
@@ -90,9 +90,3 @@
 test.up_to_date(arguments = 'seq')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit/changed-node.py b/test/implicit/changed-node.py
index 99ea01b0d7..8c2f4801c9 100644
--- a/test/implicit/changed-node.py
+++ b/test/implicit/changed-node.py
@@ -132,9 +132,3 @@ def lister(target, source, env):
 #clean(1)
 #
 #clean(1)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/import.py b/test/import.py
index 50d7b2178c..3a9b1018c5 100644
--- a/test/import.py
+++ b/test/import.py
@@ -197,9 +197,3 @@
 test.fail_test(len(failures))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/issue2821.py b/test/issue2821.py
index b6cda71644..fa73196264 100644
--- a/test/issue2821.py
+++ b/test/issue2821.py
@@ -41,10 +41,3 @@ def blub():
 test.run()
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/leaky-handles.py b/test/leaky-handles.py
index 13ea1304b7..059c3480bb 100644
--- a/test/leaky-handles.py
+++ b/test/leaky-handles.py
@@ -51,9 +51,3 @@
 test.run(arguments = '-Q', stdout='3\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/long-lines/live.py b/test/long-lines/live.py
index 5618f55f9d..a1cfc0761e 100644
--- a/test/long-lines/live.py
+++ b/test/long-lines/live.py
@@ -49,7 +49,7 @@
         arflag_init = 'r'
         arflag = 'o'
         linkflag_init = '-L' + test.workpath()
-        linkflag = ' -L' + test.workpath()    
+        linkflag = ' -L' + test.workpath()
 elif sys.platform == 'cygwin':
     lib_static_lib = 'libstatic.a'
     lib_shared_dll ='shared.dll'
@@ -140,9 +140,3 @@
 test.must_exist(lib_shared_dll)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/long-lines/signature.py b/test/long-lines/signature.py
index ef1b956c75..117190463d 100644
--- a/test/long-lines/signature.py
+++ b/test/long-lines/signature.py
@@ -101,9 +101,3 @@
 test.up_to_date(options='FILEFLAG=second TIMESTAMP=20090209', arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/multiline.py b/test/multiline.py
index b910b69455..fae6a599b1 100644
--- a/test/multiline.py
+++ b/test/multiline.py
@@ -62,10 +62,3 @@
 test.fail_test(test.read(test.workpath('foo3.out')) != b"foo3.in\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/build_libraries.py b/test/ninja/build_libraries.py
index 9436053c7b..79c3d779d8 100644
--- a/test/ninja/build_libraries.py
+++ b/test/ninja/build_libraries.py
@@ -89,9 +89,3 @@
 test.run(program=test.workpath('test_static'), stdout="library_function")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/command_line_targets.py b/test/ninja/command_line_targets.py
index 1a6033b9e0..2254ca29b9 100644
--- a/test/ninja/command_line_targets.py
+++ b/test/ninja/command_line_targets.py
@@ -81,9 +81,3 @@
 test.must_exist([test.workpath('out2.txt')])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/copy_function_command-4731.py b/test/ninja/copy_function_command-4731.py
index 108d82a854..85f96a5282 100644
--- a/test/ninja/copy_function_command-4731.py
+++ b/test/ninja/copy_function_command-4731.py
@@ -83,9 +83,3 @@
 test.run(program=test.workpath('foo'), stdout="foo.c")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/copy_function_command.py b/test/ninja/copy_function_command.py
index ad2b7c6896..453aca08ea 100644
--- a/test/ninja/copy_function_command.py
+++ b/test/ninja/copy_function_command.py
@@ -77,9 +77,3 @@
 test.run(program=test.workpath('foo'), stdout="foo.c")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/default_targets.py b/test/ninja/default_targets.py
index e809d75379..bbc1fc678b 100644
--- a/test/ninja/default_targets.py
+++ b/test/ninja/default_targets.py
@@ -69,9 +69,3 @@
 test.must_exist(test.workpath('out2.txt'))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/force_scons_callback-4730.py b/test/ninja/force_scons_callback-4730.py
index acebb9049a..71d99b86d7 100644
--- a/test/ninja/force_scons_callback-4730.py
+++ b/test/ninja/force_scons_callback-4730.py
@@ -93,9 +93,3 @@
 test.must_contain(test.workpath("build.ninja"), "PORT = 9999")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/force_scons_callback.py b/test/ninja/force_scons_callback.py
index c37c464d9d..0c74ab5a22 100644
--- a/test/ninja/force_scons_callback.py
+++ b/test/ninja/force_scons_callback.py
@@ -87,9 +87,3 @@
 test.must_contain(test.workpath("build.ninja"), "PORT = 9999")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/generate_and_build.py b/test/ninja/generate_and_build.py
index 9d056836fa..9370d67bcd 100644
--- a/test/ninja/generate_and_build.py
+++ b/test/ninja/generate_and_build.py
@@ -73,9 +73,3 @@
 test.run(program=test.workpath('foo' + _exe), stdout="foo.c")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/generate_and_build_cxx.py b/test/ninja/generate_and_build_cxx.py
index 80faa4bbe1..9a2757199e 100644
--- a/test/ninja/generate_and_build_cxx.py
+++ b/test/ninja/generate_and_build_cxx.py
@@ -88,9 +88,3 @@ class Foo
 test.run(program=test.workpath('test2' + _exe), stdout="print_function2")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/generate_source.py b/test/ninja/generate_source.py
index b848b17c14..806d2c6fab 100644
--- a/test/ninja/generate_source.py
+++ b/test/ninja/generate_source.py
@@ -102,9 +102,3 @@
 test.run(program=test.workpath('generated_source' + _exe), stdout="generated_source.c")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/generated_sources_alias.py b/test/ninja/generated_sources_alias.py
index 22ca734b33..4fe7d75401 100644
--- a/test/ninja/generated_sources_alias.py
+++ b/test/ninja/generated_sources_alias.py
@@ -72,9 +72,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/iterative_speedup.py b/test/ninja/iterative_speedup.py
index b787958ed2..cc952090a9 100644
--- a/test/ninja/iterative_speedup.py
+++ b/test/ninja/iterative_speedup.py
@@ -233,9 +233,3 @@ def mod_source_orig(test_num):
         print("Single File Rebuild   - SCons: {:.3f}s Ninja: {:.3f}s".format(scons_time, ninja_time))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/mingw_command_generator_action.py b/test/ninja/mingw_command_generator_action.py
index ad7878469a..e1a2a1fa8b 100644
--- a/test/ninja/mingw_command_generator_action.py
+++ b/test/ninja/mingw_command_generator_action.py
@@ -79,9 +79,3 @@
 test.run(program=test.workpath('test' + _exe), stdout="library_function")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/mingw_depfile_format.py b/test/ninja/mingw_depfile_format.py
index 7792440d0e..2ab47e7a7d 100644
--- a/test/ninja/mingw_depfile_format.py
+++ b/test/ninja/mingw_depfile_format.py
@@ -50,9 +50,3 @@
 test.must_contain(test.workpath('build.ninja'), 'deps = msvc')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/mkdir_function_command.py b/test/ninja/mkdir_function_command.py
index 3fd678a3f8..659deb1855 100644
--- a/test/ninja/mkdir_function_command.py
+++ b/test/ninja/mkdir_function_command.py
@@ -110,9 +110,3 @@
 ])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/multi_env.py b/test/ninja/multi_env.py
index 7b113ed22b..9098757d81 100644
--- a/test/ninja/multi_env.py
+++ b/test/ninja/multi_env.py
@@ -85,9 +85,3 @@
 test.run(program=test.workpath('bar' + _exe), stdout="bar.c")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/ninja_command_line.py b/test/ninja/ninja_command_line.py
index 8fc232e428..e3881eca1c 100644
--- a/test/ninja/ninja_command_line.py
+++ b/test/ninja/ninja_command_line.py
@@ -69,9 +69,3 @@
 test.run(program=test.workpath('foo' + _exe), stdout="foo.c")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/ninja_conftest.py b/test/ninja/ninja_conftest.py
index 60c4b033ee..6300fc273d 100644
--- a/test/ninja/ninja_conftest.py
+++ b/test/ninja/ninja_conftest.py
@@ -68,9 +68,3 @@
 test.run(program=test.workpath('foo' + _exe), stdout="foo.c")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/ninja_file_deterministic.py b/test/ninja/ninja_file_deterministic.py
index 3d226ca4e3..2723225786 100644
--- a/test/ninja/ninja_file_deterministic.py
+++ b/test/ninja/ninja_file_deterministic.py
@@ -100,9 +100,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/ninja_handle_control_c_rebuild.py b/test/ninja/ninja_handle_control_c_rebuild.py
index d187c5f437..7f9ca3431a 100644
--- a/test/ninja/ninja_handle_control_c_rebuild.py
+++ b/test/ninja/ninja_handle_control_c_rebuild.py
@@ -78,9 +78,3 @@
 # Verify that Rebuilding build.ninja and sending control-c to ninja doesn't remove build.ninja
 test.must_exist("build.ninja")
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/no_for_sig_subst.py b/test/ninja/no_for_sig_subst.py
index ef2c795991..543304de2b 100644
--- a/test/ninja/no_for_sig_subst.py
+++ b/test/ninja/no_for_sig_subst.py
@@ -67,9 +67,3 @@
 test.must_exist([test.workpath('out.txt')])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/response_file.py b/test/ninja/response_file.py
index f2561bbfa9..c00d8ae0f7 100644
--- a/test/ninja/response_file.py
+++ b/test/ninja/response_file.py
@@ -84,9 +84,3 @@
 test.run(program=test.workpath('foo' + _exe), stdout="foo.c")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/shell_command.py b/test/ninja/shell_command.py
index 8b3d134298..de5a8fb283 100644
--- a/test/ninja/shell_command.py
+++ b/test/ninja/shell_command.py
@@ -85,9 +85,3 @@
 test.must_match('foo.out', 'foo.c')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/shutdown_scons_daemon.py b/test/ninja/shutdown_scons_daemon.py
index c646f970f8..9f84e61db1 100644
--- a/test/ninja/shutdown_scons_daemon.py
+++ b/test/ninja/shutdown_scons_daemon.py
@@ -74,9 +74,3 @@
 
 test.must_not_exist(test.workpath('.ninja/scons_daemon_dirty'))
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/no-arguments.py b/test/no-arguments.py
index 588dabea73..8ba9687dd6 100644
--- a/test/no-arguments.py
+++ b/test/no-arguments.py
@@ -65,9 +65,3 @@ def cat(env, source, target):
 test.run([''], stdout=up_to_date)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/no-global-dependencies.py b/test/no-global-dependencies.py
index 541a645ec0..6b03685d96 100644
--- a/test/no-global-dependencies.py
+++ b/test/no-global-dependencies.py
@@ -166,9 +166,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/no-target.py b/test/no-target.py
index e16c8c07f7..f09cf3cd2e 100644
--- a/test/no-target.py
+++ b/test/no-target.py
@@ -67,9 +67,3 @@ def cat(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/nonexistent.py b/test/nonexistent.py
index 4a4bd6dff2..3e5da713de 100644
--- a/test/nonexistent.py
+++ b/test/nonexistent.py
@@ -93,15 +93,9 @@
 test.run(arguments='xxx', stdout=test.wrap_stdout("""\
 scons: Nothing to be done for `xxx'.
 """))
-         
+
 test.run(arguments='xxx', stdout=test.wrap_stdout("""\
 scons: Nothing to be done for `xxx'.
 """))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/d.py b/test/option/d.py
index 36be02b110..a9730e915b 100644
--- a/test/option/d.py
+++ b/test/option/d.py
@@ -142,10 +142,3 @@
 test.run(program = test.workpath('subdir/ddd'), stdout = "subdir/ddd.c\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-count.py b/test/option/debug-count.py
index dd252fc71f..3bb1d6e67c 100644
--- a/test/option/debug-count.py
+++ b/test/option/debug-count.py
@@ -82,9 +82,3 @@ def find_object_count(s, stdout):
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-duplicate.py b/test/option/debug-duplicate.py
index 8b9810d342..0bc5fe4d21 100644
--- a/test/option/debug-duplicate.py
+++ b/test/option/debug-duplicate.py
@@ -60,9 +60,3 @@
          match=TestSCons.match_re_dotall)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-findlibs.py b/test/option/debug-findlibs.py
index 8d9974c005..b02930c1c9 100644
--- a/test/option/debug-findlibs.py
+++ b/test/option/debug-findlibs.py
@@ -202,9 +202,3 @@
 test.must_match('foo.xxx', "a.ooo\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-includes.py b/test/option/debug-includes.py
index e5c8e0adfc..102e11e48d 100644
--- a/test/option/debug-includes.py
+++ b/test/option/debug-includes.py
@@ -120,9 +120,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-json.py b/test/option/debug-json.py
index 867f3c24e7..09076aa580 100644
--- a/test/option/debug-json.py
+++ b/test/option/debug-json.py
@@ -90,9 +90,3 @@ def check_json_file(filename):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-memoizer.py b/test/option/debug-memoizer.py
index 7882646165..f5e591dc89 100644
--- a/test/option/debug-memoizer.py
+++ b/test/option/debug-memoizer.py
@@ -78,9 +78,3 @@ def cat(target, source, env):
 test.must_match('file.out', "file.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-memory.py b/test/option/debug-memory.py
index 1364da5d12..d388f20cea 100644
--- a/test/option/debug-memory.py
+++ b/test/option/debug-memory.py
@@ -76,9 +76,3 @@ def cat(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-multiple.py b/test/option/debug-multiple.py
index dc86c519ac..be3997bea4 100644
--- a/test/option/debug-multiple.py
+++ b/test/option/debug-multiple.py
@@ -80,9 +80,3 @@ def find_object_count(s, stdout):
         test.fail_test(1)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-objects.py b/test/option/debug-objects.py
index 57888460f0..07da2fa21e 100644
--- a/test/option/debug-objects.py
+++ b/test/option/debug-objects.py
@@ -51,9 +51,3 @@ def cat(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-pdb.py b/test/option/debug-pdb.py
index ec303a5928..d831787375 100644
--- a/test/option/debug-pdb.py
+++ b/test/option/debug-pdb.py
@@ -37,9 +37,3 @@
 test.must_contain_all_lines(test.stdout(), ["(Pdb)", "SCons"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-prepare.py b/test/option/debug-prepare.py
index 0ed95f9f21..65d81d77d1 100644
--- a/test/option/debug-prepare.py
+++ b/test/option/debug-prepare.py
@@ -53,9 +53,3 @@
 test.must_exist('foo.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-presub.py b/test/option/debug-presub.py
index 0c5d2e9fe1..00838f6496 100644
--- a/test/option/debug-presub.py
+++ b/test/option/debug-presub.py
@@ -202,9 +202,3 @@ def cat(env, source, target):
 test.must_match('file20.obj', "file20.c\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-sconscript.py b/test/option/debug-sconscript.py
index 337a2c4e72..7ce8b47098 100644
--- a/test/option/debug-sconscript.py
+++ b/test/option/debug-sconscript.py
@@ -64,9 +64,3 @@
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-stacktrace.py b/test/option/debug-stacktrace.py
index f0f92c1131..d7238e6654 100644
--- a/test/option/debug-stacktrace.py
+++ b/test/option/debug-stacktrace.py
@@ -82,9 +82,3 @@ def kfile_scan(node, env, target):
 test.must_contain_all_lines(test.stderr(), lines)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-time.py b/test/option/debug-time.py
index 19f1e7cc46..409b562485 100644
--- a/test/option/debug-time.py
+++ b/test/option/debug-time.py
@@ -214,9 +214,3 @@ def get_command_time(stdout):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/environment-overrides.py b/test/option/environment-overrides.py
index fe2ac249a1..db6ebcbe00 100644
--- a/test/option/environment-overrides.py
+++ b/test/option/environment-overrides.py
@@ -41,10 +41,3 @@
          stderr = "Warning:  ignoring --environment-overrides option\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/h.py b/test/option/h.py
index adcec3aaeb..f921333475 100644
--- a/test/option/h.py
+++ b/test/option/h.py
@@ -55,9 +55,3 @@
 test.must_contain_all_lines(test.stdout(), ['-h, --help'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/hash-format.py b/test/option/hash-format.py
index 663ad2ee8b..3518af850c 100644
--- a/test/option/hash-format.py
+++ b/test/option/hash-format.py
@@ -95,9 +95,3 @@
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/help-options.py b/test/option/help-options.py
index c84961f83d..1b2a15d1df 100644
--- a/test/option/help-options.py
+++ b/test/option/help-options.py
@@ -65,10 +65,3 @@
     test.fail_test()
 
 test.pass_test()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/md5-chunksize.py b/test/option/md5-chunksize.py
index fa92b8c619..45990b28b0 100644
--- a/test/option/md5-chunksize.py
+++ b/test/option/md5-chunksize.py
@@ -115,9 +115,3 @@ def get_stat(target, source, env):
 
 test2.run(arguments='--md5-chunksize=128', stdout=expected_stdout, stderr='')
 test2.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/no-print-directory.py b/test/option/no-print-directory.py
index 2a5857ec2f..0f096d355c 100644
--- a/test/option/no-print-directory.py
+++ b/test/option/no-print-directory.py
@@ -38,10 +38,3 @@
          stderr = "Warning:  ignoring --no-print-directory option\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--.py b/test/option/option--.py
index dbfb3c92ff..2792ff1a9f 100644
--- a/test/option/option--.py
+++ b/test/option/option--.py
@@ -57,9 +57,3 @@
 test.fail_test(not os.path.exists(test.workpath('-f2.out')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--C.py b/test/option/option--C.py
index 2d86fac05f..bb6ec8c486 100644
--- a/test/option/option--C.py
+++ b/test/option/option--C.py
@@ -103,9 +103,3 @@ def match_normcase(lines, matches):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--I.py b/test/option/option--I.py
index 0ca262ddff..a9f42b0f7c 100644
--- a/test/option/option--I.py
+++ b/test/option/option--I.py
@@ -58,10 +58,3 @@
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--Q.py b/test/option/option--Q.py
index ac56d346a3..dd15869f13 100644
--- a/test/option/option--Q.py
+++ b/test/option/option--Q.py
@@ -86,9 +86,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--R.py b/test/option/option--R.py
index 3b66e288a2..97c060ff25 100644
--- a/test/option/option--R.py
+++ b/test/option/option--R.py
@@ -35,9 +35,3 @@
 test.option_not_yet_implemented('--no-builtin-variables', '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--S.py b/test/option/option--S.py
index e95f14f480..b536f5b798 100644
--- a/test/option/option--S.py
+++ b/test/option/option--S.py
@@ -38,10 +38,3 @@
 test.run(arguments = '--stop .', stderr = "Warning:  ignoring --stop option\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--W.py b/test/option/option--W.py
index 3f68fbc0d6..17828ec920 100644
--- a/test/option/option--W.py
+++ b/test/option/option--W.py
@@ -41,9 +41,3 @@
 test.option_not_yet_implemented('--assume-new', '=foo .')
 
 test.pass_test()
- 
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--Y.py b/test/option/option--Y.py
index 90d84fbcd9..eef012142a 100644
--- a/test/option/option--Y.py
+++ b/test/option/option--Y.py
@@ -284,9 +284,3 @@
 test.up_to_date(chdir='work2', options=opts, arguments='.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--duplicate.py b/test/option/option--duplicate.py
index 927de86c93..232bc3e670 100644
--- a/test/option/option--duplicate.py
+++ b/test/option/option--duplicate.py
@@ -131,9 +131,3 @@ def RunTest(order, type, bss):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--experimental.py b/test/option/option--experimental.py
index da0f0a5693..2b1bda53c2 100755
--- a/test/option/option--experimental.py
+++ b/test/option/option--experimental.py
@@ -56,9 +56,3 @@
          status=2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--la.py b/test/option/option--la.py
index 8a264aab7f..5eface9f16 100644
--- a/test/option/option--la.py
+++ b/test/option/option--la.py
@@ -33,9 +33,3 @@
 test.option_not_yet_implemented('--list-actions', '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--ld.py b/test/option/option--ld.py
index 90c93460cd..f0e0c08c73 100644
--- a/test/option/option--ld.py
+++ b/test/option/option--ld.py
@@ -33,9 +33,3 @@
 test.option_not_yet_implemented('--list-derived', '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--lw.py b/test/option/option--lw.py
index f0f5e786fd..d66cd61f4a 100644
--- a/test/option/option--lw.py
+++ b/test/option/option--lw.py
@@ -33,9 +33,3 @@
 test.option_not_yet_implemented('--list-where', '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--max-drift.py b/test/option/option--max-drift.py
index 9db3933a71..c6fc203fcf 100644
--- a/test/option/option--max-drift.py
+++ b/test/option/option--max-drift.py
@@ -121,9 +121,3 @@
 test.must_match('foo.out', 'foo.in\n', mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--override.py b/test/option/option--override.py
index 7d81fb170e..1b885396cf 100644
--- a/test/option/option--override.py
+++ b/test/option/option--override.py
@@ -33,9 +33,3 @@
 test.option_not_yet_implemented('--override', '=foo .')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--random.py b/test/option/option--random.py
index 1521e3a44b..59132e61f4 100644
--- a/test/option/option--random.py
+++ b/test/option/option--random.py
@@ -112,9 +112,3 @@ def cat(env, source, target):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--tree.py b/test/option/option--tree.py
index b575fe5eaa..e1145ed066 100644
--- a/test/option/option--tree.py
+++ b/test/option/option--tree.py
@@ -83,9 +83,3 @@
 test.run(arguments='-Q --tree=linedraw', stdout=expected, status=0)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--wf.py b/test/option/option--wf.py
index 79824f305a..55329d4043 100644
--- a/test/option/option--wf.py
+++ b/test/option/option--wf.py
@@ -33,9 +33,3 @@
 test.option_not_yet_implemented('--write-filenames', '=FILE .')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option--wuv.py b/test/option/option--wuv.py
index c6845289a2..38566b33a6 100644
--- a/test/option/option--wuv.py
+++ b/test/option/option--wuv.py
@@ -41,9 +41,3 @@
 test.option_not_yet_implemented('--warn-undefined-variables')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-b.py b/test/option/option-b.py
index 5a1e6452fb..8b1e24ae15 100644
--- a/test/option/option-b.py
+++ b/test/option/option-b.py
@@ -34,10 +34,3 @@
          stderr = "Warning:  ignoring -b option\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-f.py b/test/option/option-f.py
index a2c8561adf..4cf292f148 100644
--- a/test/option/option-f.py
+++ b/test/option/option-f.py
@@ -145,9 +145,3 @@
 test.must_contain_all_lines(test.stderr(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-i.py b/test/option/option-i.py
index e426e1feef..75b6cbb9b2 100644
--- a/test/option/option-i.py
+++ b/test/option/option-i.py
@@ -73,7 +73,7 @@
     arguments='-i aaa.1 aaa.out bbb.1 bbb.out',
     stderr='scons: *** [aaa.1] Error 1\nscons: *** [bbb.1] Error 1\n',
 )
-         
+
 test.fail_test(os.path.exists(test.workpath('aaa.1')))
 test.fail_test(test.read('aaa.out',mode='r') != "succeed.py: aaa.out\n")
 test.fail_test(os.path.exists(test.workpath('bbb.1')))
@@ -93,10 +93,3 @@
 test.fail_test(test.read('bbb.out', mode='r') != "succeed.py: bbb.out\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-j.py b/test/option/option-j.py
index 96b4a75b52..6a18d2c1ac 100644
--- a/test/option/option-j.py
+++ b/test/option/option-j.py
@@ -184,9 +184,3 @@ def copyn(env, target, source):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-k.py b/test/option/option-k.py
index 6a7cfcbde2..305fa13f60 100644
--- a/test/option/option-k.py
+++ b/test/option/option-k.py
@@ -49,7 +49,7 @@
 
 #
 # Test: work1
-# 
+#
 
 test.write(['work1', 'SConstruct'], """\
 DefaultEnvironment(tools=[])
@@ -119,7 +119,7 @@
 
 #
 # Test: work2
-# 
+#
 
 test.write(['work2', 'SConstruct'], """\
 DefaultEnvironment(tools=[])
@@ -171,12 +171,12 @@
 #          |           |             |
 #         a1           a2           a3
 #          |           |             |
-#          +       +---+---+     +---+---+ 
+#          +       +---+---+     +---+---+
 #          \       |      /      |       |
 #           \   bbb.out  /      a4    ccc.out
-#            \          /       /        
-#             \        /       /  
-#              \      /       /  
+#            \          /       /
+#             \        /       /
+#              \      /       /
 #              aaa.out (fails)
 #
 
@@ -305,9 +305,3 @@
 test.must_exist(['work3', 'ccc.out'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-l.py b/test/option/option-l.py
index af308af76c..44aae38f7d 100644
--- a/test/option/option-l.py
+++ b/test/option/option-l.py
@@ -37,9 +37,3 @@
 test.option_not_yet_implemented('--max-load', '=1 .')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-m.py b/test/option/option-m.py
index 319b4f7bba..a81daa0306 100644
--- a/test/option/option-m.py
+++ b/test/option/option-m.py
@@ -34,10 +34,3 @@
          stderr = "Warning:  ignoring -m option\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-n.py b/test/option/option-n.py
index 1170927024..4deccf4fbe 100644
--- a/test/option/option-n.py
+++ b/test/option/option-n.py
@@ -248,9 +248,3 @@ def strAction(target,source,env):
 test.fail_test(log1_mtime != log2_mtime)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-o.py b/test/option/option-o.py
index bde8e8f439..6ed967f96e 100644
--- a/test/option/option-o.py
+++ b/test/option/option-o.py
@@ -37,9 +37,3 @@
 test.option_not_yet_implemented('--assume-old', '=foo .')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-p.py b/test/option/option-p.py
index 11390ab2bc..3260856dc0 100644
--- a/test/option/option-p.py
+++ b/test/option/option-p.py
@@ -33,9 +33,3 @@
 test.option_not_yet_implemented('-p', '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-r.py b/test/option/option-r.py
index a3c3911d3a..ace57c571f 100644
--- a/test/option/option-r.py
+++ b/test/option/option-r.py
@@ -35,9 +35,3 @@
 test.option_not_yet_implemented('--no-builtin-rules', '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-s.py b/test/option/option-s.py
index 359c29592a..c5c43ef5fb 100644
--- a/test/option/option-s.py
+++ b/test/option/option-s.py
@@ -87,9 +87,3 @@
 test.fail_test(not os.path.exists(test.workpath('f2.out')))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-t.py b/test/option/option-t.py
index f7ec081e98..e6c543c075 100644
--- a/test/option/option-t.py
+++ b/test/option/option-t.py
@@ -37,10 +37,3 @@
          stderr = "Warning:  ignoring --touch option\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-unknown.py b/test/option/option-unknown.py
index 62928bea15..90fd0d31bf 100644
--- a/test/option/option-unknown.py
+++ b/test/option/option-unknown.py
@@ -44,9 +44,3 @@
          status = 2)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option-v.py b/test/option/option-v.py
index 3164027ddc..f4f3ef6294 100644
--- a/test/option/option-v.py
+++ b/test/option/option-v.py
@@ -55,10 +55,3 @@
     test.fail_test()
 
 test.pass_test()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/option_profile.py b/test/option/option_profile.py
index f5c737e477..fde16ccc5d 100644
--- a/test/option/option_profile.py
+++ b/test/option/option_profile.py
@@ -102,9 +102,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/print-directory.py b/test/option/print-directory.py
index 79d81d9e09..ea61cfb200 100644
--- a/test/option/print-directory.py
+++ b/test/option/print-directory.py
@@ -41,10 +41,3 @@
          stderr = "Warning:  ignoring --print-directory option\n")
 
 test.pass_test()
- 
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/repository.py b/test/option/repository.py
index 392c42180c..9bf029e329 100644
--- a/test/option/repository.py
+++ b/test/option/repository.py
@@ -60,9 +60,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/srcdir.py b/test/option/srcdir.py
index 15c8f95686..8bb789f87f 100644
--- a/test/option/srcdir.py
+++ b/test/option/srcdir.py
@@ -60,9 +60,3 @@
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/stack-size.py b/test/option/stack-size.py
index e9cb38e73b..bb6e78555f 100644
--- a/test/option/stack-size.py
+++ b/test/option/stack-size.py
@@ -359,9 +359,3 @@
     test.must_not_exist(['work2', 'f2.out'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/taskmastertrace.py b/test/option/taskmastertrace.py
index 35ab6fc560..5b1047bbec 100755
--- a/test/option/taskmastertrace.py
+++ b/test/option/taskmastertrace.py
@@ -64,9 +64,3 @@
 test.must_match('taskmaster_expected_new_parallel.txt', new_trace,  mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/tree-all.py b/test/option/tree-all.py
index 6222ba1ac9..728f2020f9 100644
--- a/test/option/tree-all.py
+++ b/test/option/tree-all.py
@@ -227,9 +227,3 @@
     test.fail_test()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/tree-derived.py b/test/option/tree-derived.py
index 84d30fccc5..0825ba0b83 100644
--- a/test/option/tree-derived.py
+++ b/test/option/tree-derived.py
@@ -140,9 +140,3 @@
 test.must_contain_all_lines(test.stdout(), [dtree1])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/tree-lib.py b/test/option/tree-lib.py
index 1e6df026c7..4cfb12dd9e 100644
--- a/test/option/tree-lib.py
+++ b/test/option/tree-lib.py
@@ -81,9 +81,3 @@
 test.up_to_date(arguments = 'foo.h')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/warn-dependency.py b/test/option/warn-dependency.py
index dca3815602..32422ddb12 100644
--- a/test/option/warn-dependency.py
+++ b/test/option/warn-dependency.py
@@ -70,9 +70,3 @@ def build(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/warn-duplicate-environment.py b/test/option/warn-duplicate-environment.py
index f19c533e82..a038502fba 100644
--- a/test/option/warn-duplicate-environment.py
+++ b/test/option/warn-duplicate-environment.py
@@ -74,9 +74,3 @@ def build(env, target, source):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/warn-misleading-keywords.py b/test/option/warn-misleading-keywords.py
index 5f78e63f94..7b764a87c6 100644
--- a/test/option/warn-misleading-keywords.py
+++ b/test/option/warn-misleading-keywords.py
@@ -74,9 +74,3 @@ def build(env, target, source):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/overrides.py b/test/overrides.py
index 54a174b9a7..caa2983907 100644
--- a/test/overrides.py
+++ b/test/overrides.py
@@ -131,9 +131,3 @@ def build(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/convenience-functions/convenience-functions.py b/test/packaging/convenience-functions/convenience-functions.py
index fb9acb3099..ef2ef24f20 100644
--- a/test/packaging/convenience-functions/convenience-functions.py
+++ b/test/packaging/convenience-functions/convenience-functions.py
@@ -56,9 +56,3 @@
 test.run(stdout=expected)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/guess-package-name.py b/test/packaging/guess-package-name.py
index 1786c11dad..1dc3cf7e7b 100644
--- a/test/packaging/guess-package-name.py
+++ b/test/packaging/guess-package-name.py
@@ -130,9 +130,3 @@
     test.must_exist('libfoo-1.2.3.tar.xz')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/ipkg.py b/test/packaging/ipkg.py
index 2c7ebcf825..c4f7daac05 100644
--- a/test/packaging/ipkg.py
+++ b/test/packaging/ipkg.py
@@ -132,9 +132,3 @@
 test.must_exist( 'foo_0.0_arm.ipk' )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/msi/explicit-target.py b/test/packaging/msi/explicit-target.py
index 015baee9ea..98c0437c15 100644
--- a/test/packaging/msi/explicit-target.py
+++ b/test/packaging/msi/explicit-target.py
@@ -89,9 +89,3 @@
 test.fail_test( not Package.attributes['Comments'].value    == 'this should be reallly really long' )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/msi/file-placement.py b/test/packaging/msi/file-placement.py
index 405e55bf05..2a8a011c66 100644
--- a/test/packaging/msi/file-placement.py
+++ b/test/packaging/msi/file-placement.py
@@ -114,7 +114,7 @@
 test.fail_test( not files[1].parentNode.parentNode.attributes['LongName'].value == 'bin' )
 test.fail_test( not files[2].parentNode.parentNode.attributes['LongName'].value == 'lib' )
 test.fail_test( not files[3].parentNode.parentNode.attributes['LongName'].value == 'lib' )
-  
+
 test.fail_test( not files[4].parentNode.parentNode.attributes['LongName'].value == 'teco' )
 test.fail_test( not files[4].parentNode.parentNode.parentNode.attributes['LongName'].value == 'edu' )
 test.fail_test( not files[4].parentNode.parentNode.parentNode.parentNode.attributes['LongName'].value == 'java' )
@@ -160,19 +160,13 @@
 features = dom.getElementsByTagName( 'Feature' )
 
 test.fail_test( not features[1].attributes['Title'].value == 'Core Part' )
-componentrefs = features[1].getElementsByTagName( 'ComponentRef' ) 
+componentrefs = features[1].getElementsByTagName( 'ComponentRef' )
 test.fail_test( not componentrefs[0].attributes['Id'].value == 'file1.exe' )
 test.fail_test( not componentrefs[1].attributes['Id'].value == 'file2.exe' )
 test.fail_test( not componentrefs[2].attributes['Id'].value == 'file3.dll1' )
 
 test.fail_test( not features[2].attributes['Title'].value == 'Java Part' )
-componentrefs = features[2].getElementsByTagName( 'ComponentRef' ) 
+componentrefs = features[2].getElementsByTagName( 'ComponentRef' )
 test.fail_test( not componentrefs[0].attributes['Id'].value == 'file3.dll' )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/msi/package.py b/test/packaging/msi/package.py
index 19183bf465..7b0ca5d60b 100644
--- a/test/packaging/msi/package.py
+++ b/test/packaging/msi/package.py
@@ -135,9 +135,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/multiple-packages-at-once.py b/test/packaging/multiple-packages-at-once.py
index 35759964ff..69d114ad45 100644
--- a/test/packaging/multiple-packages-at-once.py
+++ b/test/packaging/multiple-packages-at-once.py
@@ -101,9 +101,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/multiple-subdirs.py b/test/packaging/multiple-subdirs.py
index 27b81a2042..95e4cbfeaf 100644
--- a/test/packaging/multiple-subdirs.py
+++ b/test/packaging/multiple-subdirs.py
@@ -78,9 +78,3 @@
 test.must_exist(['three', 'three-1.0.0.tar.gz'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/option--package-type.py b/test/packaging/option--package-type.py
index 089c05d570..cb59729733 100644
--- a/test/packaging/option--package-type.py
+++ b/test/packaging/option--package-type.py
@@ -88,9 +88,3 @@
 test.must_not_exist( '/bin/main.c' )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/place-files-in-subdirectory.py b/test/packaging/place-files-in-subdirectory.py
index dd422e6f47..83a04f4086 100644
--- a/test/packaging/place-files-in-subdirectory.py
+++ b/test/packaging/place-files-in-subdirectory.py
@@ -113,9 +113,3 @@
 )
 test.fail_test(cp.stdout != "libfoo-1.2.3/src/main.c\nlibfoo-1.2.3/SConstruct\n")
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/cleanup.py b/test/packaging/rpm/cleanup.py
index 178a13d8da..1ee1899769 100644
--- a/test/packaging/rpm/cleanup.py
+++ b/test/packaging/rpm/cleanup.py
@@ -99,9 +99,3 @@
 test.must_not_exist( 'bin/main' )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py
index 95684ca55c..16554cf74d 100644
--- a/test/packaging/rpm/explicit-target.py
+++ b/test/packaging/rpm/explicit-target.py
@@ -88,9 +88,3 @@
 test.run(arguments='', status=2, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/internationalization.py b/test/packaging/rpm/internationalization.py
index 28f0b450be..d53306fc34 100644
--- a/test/packaging/rpm/internationalization.py
+++ b/test/packaging/rpm/internationalization.py
@@ -168,9 +168,3 @@
 test.must_exist( machine_rpm )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/multipackage.py b/test/packaging/rpm/multipackage.py
index 99a94f2c0f..27362c1328 100644
--- a/test/packaging/rpm/multipackage.py
+++ b/test/packaging/rpm/multipackage.py
@@ -111,9 +111,3 @@
 test.fail_test( not out == 'foo-1.2.3.spec\nfoo-1.2.3.tar.gz\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/package.py b/test/packaging/rpm/package.py
index 04a8ff0aa9..27af63ec88 100644
--- a/test/packaging/rpm/package.py
+++ b/test/packaging/rpm/package.py
@@ -90,9 +90,3 @@
 test.fail_test( not out == 'foo-1.2.3.spec\nfoo-1.2.3.tar.gz\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/tagging.py b/test/packaging/rpm/tagging.py
index a888a37cca..ceb679c111 100644
--- a/test/packaging/rpm/tagging.py
+++ b/test/packaging/rpm/tagging.py
@@ -97,9 +97,3 @@
 test.must_contain_all_lines(test.read('foo-1.2.3.spec',mode='r'), [expect])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/sandbox-test/sandbox-test.py b/test/packaging/sandbox-test/sandbox-test.py
index f43a80e9eb..9783f6d25f 100644
--- a/test/packaging/sandbox-test/sandbox-test.py
+++ b/test/packaging/sandbox-test/sandbox-test.py
@@ -47,9 +47,3 @@
 test.must_exist('libfoobar-1.2.3.zip')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/strip-install-dir.py b/test/packaging/strip-install-dir.py
index 7f41c20828..8b4afb0b22 100644
--- a/test/packaging/strip-install-dir.py
+++ b/test/packaging/strip-install-dir.py
@@ -64,9 +64,3 @@
 test.must_not_exist( '/bin/main.c' )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/tar/bz2_packaging.py b/test/packaging/tar/bz2_packaging.py
index 9d56b4223e..071f2c55ae 100644
--- a/test/packaging/tar/bz2_packaging.py
+++ b/test/packaging/tar/bz2_packaging.py
@@ -65,9 +65,3 @@
 test.must_exist('src.tar.bz2')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/tar/gz.py b/test/packaging/tar/gz.py
index d54d6f1f3a..57f8a03787 100644
--- a/test/packaging/tar/gz.py
+++ b/test/packaging/tar/gz.py
@@ -64,9 +64,3 @@
 test.must_exist('src.tar.gz')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/tar/xz_packaging.py b/test/packaging/tar/xz_packaging.py
index dc28325488..196ff28402 100644
--- a/test/packaging/tar/xz_packaging.py
+++ b/test/packaging/tar/xz_packaging.py
@@ -63,9 +63,3 @@
 test.must_exist('src.tar.xz')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/use-builddir.py b/test/packaging/use-builddir.py
index f6acb5f3c3..f3377fcb67 100644
--- a/test/packaging/use-builddir.py
+++ b/test/packaging/use-builddir.py
@@ -98,9 +98,3 @@
 test.must_exist("temp/libfoo-1.2.3/SConstruct")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/zip.py b/test/packaging/zip.py
index 527ad006f0..b6d7f563a6 100644
--- a/test/packaging/zip.py
+++ b/test/packaging/zip.py
@@ -63,9 +63,3 @@
 test.must_exist( 'src.zip' )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/path-change.py b/test/path-change.py
index 0ca070ffba..6911608d0f 100644
--- a/test/path-change.py
+++ b/test/path-change.py
@@ -69,9 +69,3 @@
 test.not_up_to_date(options='SRCDIR=src2')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/preserve-source.py b/test/preserve-source.py
index b7444da6eb..7155aa0bf0 100644
--- a/test/preserve-source.py
+++ b/test/preserve-source.py
@@ -60,9 +60,3 @@ def cat(env, source, target):
 
 #
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/python-version.py b/test/python-version.py
index bbec233fdc..82c22085e9 100644
--- a/test/python-version.py
+++ b/test/python-version.py
@@ -65,9 +65,3 @@
     test.run(arguments = '-f SetOption-python -Q')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/question/Configure.py b/test/question/Configure.py
index d01d0faf7b..1d8b0402c4 100644
--- a/test/question/Configure.py
+++ b/test/question/Configure.py
@@ -122,9 +122,3 @@ def CustomTest(context):
 test.fail_test( log1_mtime != log2_mtime )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/question/basic.py b/test/question/basic.py
index 968c4f7a43..49f7718045 100644
--- a/test/question/basic.py
+++ b/test/question/basic.py
@@ -71,9 +71,3 @@
 test.run(arguments = '--question bbb.out', status = 0)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/question/no-builder.py b/test/question/no-builder.py
index bd1b120e51..d038724520 100644
--- a/test/question/no-builder.py
+++ b/test/question/no-builder.py
@@ -43,9 +43,3 @@
 test.run(arguments = '--question no_such_target', status = 1)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/rebuild-generated.py b/test/rebuild-generated.py
index 1b4292f878..3ca52b0854 100644
--- a/test/rebuild-generated.py
+++ b/test/rebuild-generated.py
@@ -119,9 +119,3 @@
 test.run(arguments = 'target' + _obj, stdout=expected_stdout)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/redirection.py b/test/redirection.py
index f30a2e3d4e..82b6ba3337 100644
--- a/test/redirection.py
+++ b/test/redirection.py
@@ -44,7 +44,7 @@
         indata = f.read()
 except IndexError:
     indata = sys.stdin.buffer.read()
-    
+
 sys.stdout.buffer.write(indata)
 sys.exit(0)
 """)
@@ -74,9 +74,3 @@
 test.must_match('foo4', 'bar4\r\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/SCons.py b/test/runtest/SCons.py
index fc4c3e06c4..71a348761c 100644
--- a/test/runtest/SCons.py
+++ b/test/runtest/SCons.py
@@ -60,9 +60,3 @@
 test.run(arguments='-k SCons', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/baseline/combined.py b/test/runtest/baseline/combined.py
index 00ce85bdfd..9cdecd129f 100644
--- a/test/runtest/baseline/combined.py
+++ b/test/runtest/baseline/combined.py
@@ -69,9 +69,3 @@
 test.run(arguments='-k -b . test', status=1, stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/baseline/fail.py b/test/runtest/baseline/fail.py
index 2268dce842..b32780d86a 100644
--- a/test/runtest/baseline/fail.py
+++ b/test/runtest/baseline/fail.py
@@ -57,9 +57,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/baseline/no_result.py b/test/runtest/baseline/no_result.py
index ce6f20cbbd..496fa29232 100644
--- a/test/runtest/baseline/no_result.py
+++ b/test/runtest/baseline/no_result.py
@@ -64,9 +64,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/baseline/pass.py b/test/runtest/baseline/pass.py
index c31a6d6a8c..72b12cf877 100644
--- a/test/runtest/baseline/pass.py
+++ b/test/runtest/baseline/pass.py
@@ -53,9 +53,3 @@
 test.run(arguments='-k -b . test', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/external_tests.py b/test/runtest/external_tests.py
index 622bfbd6e5..d663f2e575 100644
--- a/test/runtest/external_tests.py
+++ b/test/runtest/external_tests.py
@@ -83,9 +83,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/faillog.py b/test/runtest/faillog.py
index f23b90bc71..3413a09bd7 100644
--- a/test/runtest/faillog.py
+++ b/test/runtest/faillog.py
@@ -72,9 +72,3 @@
 test.must_not_exist('failed_tests.log')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/no_faillog.py b/test/runtest/no_faillog.py
index 174ab48c98..78e4692f79 100644
--- a/test/runtest/no_faillog.py
+++ b/test/runtest/no_faillog.py
@@ -77,9 +77,3 @@
 test.must_not_exist('failing_tests.log')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/pathseps.py b/test/runtest/pathseps.py
index 10d86b22e0..23509f6b6c 100644
--- a/test/runtest/pathseps.py
+++ b/test/runtest/pathseps.py
@@ -70,9 +70,3 @@
 test.run(arguments="-k -l -f testlist.txt", stdout=expect_stdout, stderr=None)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/print_time.py b/test/runtest/print_time.py
index 3d49a97025..e162878769 100644
--- a/test/runtest/print_time.py
+++ b/test/runtest/print_time.py
@@ -74,9 +74,3 @@
 test.run(arguments='-k -t test', status=1, stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/python.py b/test/runtest/python.py
index dbb24ca1a7..d6b7fda1ac 100644
--- a/test/runtest/python.py
+++ b/test/runtest/python.py
@@ -67,9 +67,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/retry.py b/test/runtest/retry.py
index 0c5beb694d..c1eb285262 100644
--- a/test/runtest/retry.py
+++ b/test/runtest/retry.py
@@ -63,9 +63,3 @@
 test.run(arguments='-k --retry', status=1, stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/simple/combined.py b/test/runtest/simple/combined.py
index e594c5048b..b2efe5904f 100644
--- a/test/runtest/simple/combined.py
+++ b/test/runtest/simple/combined.py
@@ -70,9 +70,3 @@
 test.must_contain('failed_tests.log', test_fail_py)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/simple/fail.py b/test/runtest/simple/fail.py
index 5e1979a1b7..56d60a101c 100644
--- a/test/runtest/simple/fail.py
+++ b/test/runtest/simple/fail.py
@@ -53,9 +53,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/simple/no_result.py b/test/runtest/simple/no_result.py
index beb82b01c4..5139ba1c0c 100644
--- a/test/runtest/simple/no_result.py
+++ b/test/runtest/simple/no_result.py
@@ -64,9 +64,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/simple/pass.py b/test/runtest/simple/pass.py
index 408ef4c28a..1d0c97948b 100644
--- a/test/runtest/simple/pass.py
+++ b/test/runtest/simple/pass.py
@@ -51,9 +51,3 @@
 test.run(arguments='-k test/pass.py', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/testargv.py b/test/runtest/testargv.py
index 20dcdc848e..5dd9f1b216 100644
--- a/test/runtest/testargv.py
+++ b/test/runtest/testargv.py
@@ -68,9 +68,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/testlistfile.py b/test/runtest/testlistfile.py
index e5d85b8dc7..3314f227a4 100644
--- a/test/runtest/testlistfile.py
+++ b/test/runtest/testlistfile.py
@@ -65,9 +65,3 @@
 test.run(arguments='-k -f t.txt', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/xml/output.py b/test/runtest/xml/output.py
index 66ec6562b6..0ba13bd24b 100644
--- a/test/runtest/xml/output.py
+++ b/test/runtest/xml/output.py
@@ -93,9 +93,3 @@
 test.must_match('xml.out', expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/same-name.py b/test/same-name.py
index 8a1c5e87c2..8f71ac7c24 100644
--- a/test/same-name.py
+++ b/test/same-name.py
@@ -75,9 +75,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/basic.py b/test/scons-time/func/basic.py
index fe24f998c3..66c58539d9 100644
--- a/test/scons-time/func/basic.py
+++ b/test/scons-time/func/basic.py
@@ -47,9 +47,3 @@ def _main():
 test.run(arguments = 'func foo.prof', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/chdir.py b/test/scons-time/func/chdir.py
index 412a1c8aad..370b9491bd 100644
--- a/test/scons-time/func/chdir.py
+++ b/test/scons-time/func/chdir.py
@@ -61,9 +61,3 @@ def _main():
 test.run(arguments = 'func --chdir profs foo-?.prof', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/file.py b/test/scons-time/func/file.py
index 8e12123610..5ef0ac40df 100644
--- a/test/scons-time/func/file.py
+++ b/test/scons-time/func/file.py
@@ -100,9 +100,3 @@ def _main():
 test.must_contain_exactly_lines(test.stdout(), expect2, find=TestSCons_time.search_re_in_list)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/format-gnuplot.py b/test/scons-time/func/format-gnuplot.py
index 223193612b..c7b6c422e4 100644
--- a/test/scons-time/func/format-gnuplot.py
+++ b/test/scons-time/func/format-gnuplot.py
@@ -80,9 +80,3 @@ def _main():
 test.run(arguments = 'func --format=gnuplot', stdout=expect_notitle)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/funcglob.py b/test/scons-time/func/funcglob.py
index 3fff746322..2d567ecd4a 100644
--- a/test/scons-time/func/funcglob.py
+++ b/test/scons-time/func/funcglob.py
@@ -54,9 +54,3 @@ def _main():
 test.run(arguments = 'func foo-?.prof', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/function.py b/test/scons-time/func/function.py
index c76bb2f248..27bb94d0cc 100644
--- a/test/scons-time/func/function.py
+++ b/test/scons-time/func/function.py
@@ -56,9 +56,3 @@ def _main():
 test.run(arguments = 'func --function f3 foo.prof', stdout = expect3)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/help.py b/test/scons-time/func/help.py
index 61a1a6db62..c451b338c4 100644
--- a/test/scons-time/func/help.py
+++ b/test/scons-time/func/help.py
@@ -55,9 +55,3 @@
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/no-args.py b/test/scons-time/func/no-args.py
index 4e2df8d1d5..0767ae6ffd 100644
--- a/test/scons-time/func/no-args.py
+++ b/test/scons-time/func/no-args.py
@@ -41,9 +41,3 @@
 test.run(arguments = 'func', status = 1, stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/prefix.py b/test/scons-time/func/prefix.py
index 36c9ddf0a2..58617a3a15 100644
--- a/test/scons-time/func/prefix.py
+++ b/test/scons-time/func/prefix.py
@@ -62,9 +62,3 @@ def _main():
 test.run(arguments = 'func --prefix=foo', stdout = foo_expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/tail.py b/test/scons-time/func/tail.py
index 64d041a655..452d4d7d82 100644
--- a/test/scons-time/func/tail.py
+++ b/test/scons-time/func/tail.py
@@ -53,9 +53,3 @@ def _main():
 test.run(arguments = 'func --tail 5 foo-*.prof', stdout = ''.join(expect[-5:]))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/help/all-subcommands.py b/test/scons-time/help/all-subcommands.py
index 03ddc46691..e8a0240aa9 100644
--- a/test/scons-time/help/all-subcommands.py
+++ b/test/scons-time/help/all-subcommands.py
@@ -55,9 +55,3 @@ class has a line in the help string.
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/help/options.py b/test/scons-time/help/options.py
index 8fd192dca9..43f442741d 100644
--- a/test/scons-time/help/options.py
+++ b/test/scons-time/help/options.py
@@ -57,9 +57,3 @@
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/chdir.py b/test/scons-time/mem/chdir.py
index 5bf618c76b..6c3f8b966c 100644
--- a/test/scons-time/mem/chdir.py
+++ b/test/scons-time/mem/chdir.py
@@ -55,9 +55,3 @@
 test.run(arguments = 'mem --chdir logs foo-?.log', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/file.py b/test/scons-time/mem/file.py
index fb329a0766..a1e7181286 100644
--- a/test/scons-time/mem/file.py
+++ b/test/scons-time/mem/file.py
@@ -76,9 +76,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/format-gnuplot.py b/test/scons-time/mem/format-gnuplot.py
index 5f3e9cd7d0..a4e0f19f25 100644
--- a/test/scons-time/mem/format-gnuplot.py
+++ b/test/scons-time/mem/format-gnuplot.py
@@ -70,9 +70,3 @@
 test.run(arguments = 'mem --format=gnuplot', stdout=expect_notitle)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/help.py b/test/scons-time/mem/help.py
index 4ff34fae02..3adb1213cf 100644
--- a/test/scons-time/mem/help.py
+++ b/test/scons-time/mem/help.py
@@ -55,9 +55,3 @@
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/memglob.py b/test/scons-time/mem/memglob.py
index 820021e7c0..52eb8b6dd2 100644
--- a/test/scons-time/mem/memglob.py
+++ b/test/scons-time/mem/memglob.py
@@ -50,9 +50,3 @@
 test.run(arguments = 'mem foo-?.log', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/no-args.py b/test/scons-time/mem/no-args.py
index 0d1380f8f4..cb47c9bc04 100644
--- a/test/scons-time/mem/no-args.py
+++ b/test/scons-time/mem/no-args.py
@@ -41,9 +41,3 @@
 test.run(arguments = 'mem', status = 1, stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/prefix.py b/test/scons-time/mem/prefix.py
index faca54dab7..81fc71640e 100644
--- a/test/scons-time/mem/prefix.py
+++ b/test/scons-time/mem/prefix.py
@@ -60,9 +60,3 @@
 test.run(arguments = 'mem --prefix=foo', stdout = foo_expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/stage.py b/test/scons-time/mem/stage.py
index 849c71e515..88b21e29e5 100644
--- a/test/scons-time/mem/stage.py
+++ b/test/scons-time/mem/stage.py
@@ -81,9 +81,3 @@
          stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/tail.py b/test/scons-time/mem/tail.py
index cd00274063..aa7140762c 100644
--- a/test/scons-time/mem/tail.py
+++ b/test/scons-time/mem/tail.py
@@ -53,9 +53,3 @@
 test.run(arguments = 'mem --tail 5 foo-*.log', stdout = ''.join(expect5))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/no-args.py b/test/scons-time/no-args.py
index 1ea6901057..ba98da2edf 100644
--- a/test/scons-time/no-args.py
+++ b/test/scons-time/no-args.py
@@ -40,9 +40,3 @@
 test.run(arguments = '', status=1, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/chdir.py b/test/scons-time/obj/chdir.py
index 4b77f8ab0b..9c1ec9c094 100644
--- a/test/scons-time/obj/chdir.py
+++ b/test/scons-time/obj/chdir.py
@@ -55,9 +55,3 @@
 test.run(arguments = 'obj --chdir logs Environment.Base foo-?.log', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/file.py b/test/scons-time/obj/file.py
index 5076d7f329..3cf8e742c0 100644
--- a/test/scons-time/obj/file.py
+++ b/test/scons-time/obj/file.py
@@ -76,9 +76,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/format-gnuplot.py b/test/scons-time/obj/format-gnuplot.py
index cdded16d8d..b47d843a63 100644
--- a/test/scons-time/obj/format-gnuplot.py
+++ b/test/scons-time/obj/format-gnuplot.py
@@ -74,9 +74,3 @@
          stdout=expect_notitle)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/help.py b/test/scons-time/obj/help.py
index d4cc1bd074..0f21f4d25f 100644
--- a/test/scons-time/obj/help.py
+++ b/test/scons-time/obj/help.py
@@ -55,9 +55,3 @@
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/no-args.py b/test/scons-time/obj/no-args.py
index 9350b797eb..a4d3f845d2 100644
--- a/test/scons-time/obj/no-args.py
+++ b/test/scons-time/obj/no-args.py
@@ -40,9 +40,3 @@
 test.run(arguments = 'obj', status = 1, stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/no-files.py b/test/scons-time/obj/no-files.py
index 50e5df102c..cd91cebfac 100644
--- a/test/scons-time/obj/no-files.py
+++ b/test/scons-time/obj/no-files.py
@@ -42,9 +42,3 @@
 test.run(arguments = 'obj fake.object', status = 1, stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/objglob.py b/test/scons-time/obj/objglob.py
index 2105355adf..ceb9b2600a 100644
--- a/test/scons-time/obj/objglob.py
+++ b/test/scons-time/obj/objglob.py
@@ -50,9 +50,3 @@
 test.run(arguments = 'obj Builder.BuilderBase foo-?.log', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/prefix.py b/test/scons-time/obj/prefix.py
index 0bee5f7033..69eb4f7bc4 100644
--- a/test/scons-time/obj/prefix.py
+++ b/test/scons-time/obj/prefix.py
@@ -60,9 +60,3 @@
 test.run(arguments = 'obj --prefix=foo Environment.Base', stdout = foo_expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/stage.py b/test/scons-time/obj/stage.py
index 7361f6978c..5dbd15b984 100644
--- a/test/scons-time/obj/stage.py
+++ b/test/scons-time/obj/stage.py
@@ -86,9 +86,3 @@
          stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/tail.py b/test/scons-time/obj/tail.py
index 341a905f2f..148d58f3e4 100644
--- a/test/scons-time/obj/tail.py
+++ b/test/scons-time/obj/tail.py
@@ -53,9 +53,3 @@
 test.run(arguments = 'obj --tail 5 Node.FS foo-*.log', stdout = expect5)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/dir.py b/test/scons-time/run/archive/dir.py
index 590d568e4f..a6c48ec1ed 100644
--- a/test/scons-time/run/archive/dir.py
+++ b/test/scons-time/run/archive/dir.py
@@ -47,9 +47,3 @@
                 'foo-000-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/tar-gz.py b/test/scons-time/run/archive/tar-gz.py
index af11c338d0..ac69e295fb 100644
--- a/test/scons-time/run/archive/tar-gz.py
+++ b/test/scons-time/run/archive/tar-gz.py
@@ -47,9 +47,3 @@
                 'foo-000-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/tar.py b/test/scons-time/run/archive/tar.py
index a85dacffd3..18823d75ff 100644
--- a/test/scons-time/run/archive/tar.py
+++ b/test/scons-time/run/archive/tar.py
@@ -47,9 +47,3 @@
                 'foo-000-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/tgz.py b/test/scons-time/run/archive/tgz.py
index c349e02025..f7df9a0110 100644
--- a/test/scons-time/run/archive/tgz.py
+++ b/test/scons-time/run/archive/tgz.py
@@ -47,9 +47,3 @@
                 'foo-000-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/zip.py b/test/scons-time/run/archive/zip.py
index 7bd5538ec6..d7c262ed51 100644
--- a/test/scons-time/run/archive/zip.py
+++ b/test/scons-time/run/archive/zip.py
@@ -48,9 +48,3 @@
                 'foo-000-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/archive_list.py b/test/scons-time/run/config/archive_list.py
index d393a694d7..8ddde3d08e 100644
--- a/test/scons-time/run/config/archive_list.py
+++ b/test/scons-time/run/config/archive_list.py
@@ -75,9 +75,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/initial_commands.py b/test/scons-time/run/config/initial_commands.py
index 58d777a8c8..a561d91320 100644
--- a/test/scons-time/run/config/initial_commands.py
+++ b/test/scons-time/run/config/initial_commands.py
@@ -55,9 +55,3 @@ def touch(arg):
 test.must_exist('INITIAL')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/prefix.py b/test/scons-time/run/config/prefix.py
index 5ef673b625..c04c9e7757 100644
--- a/test/scons-time/run/config/prefix.py
+++ b/test/scons-time/run/config/prefix.py
@@ -50,9 +50,3 @@
                 'bar-000-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/python.py b/test/scons-time/run/config/python.py
index b880fb4a40..0f7868ebb6 100644
--- a/test/scons-time/run/config/python.py
+++ b/test/scons-time/run/config/python.py
@@ -76,9 +76,3 @@
 test.must_match('foo-000-2.log', "my_python.py: %s\n" % prof2, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/scons.py b/test/scons-time/run/config/scons.py
index 168ee7a422..d256623440 100644
--- a/test/scons-time/run/config/scons.py
+++ b/test/scons-time/run/config/scons.py
@@ -60,9 +60,3 @@
 test.must_match('foo-000-2.log', "my_scons.py: %s\n" % prof2, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/subdir.py b/test/scons-time/run/config/subdir.py
index 1d7ca8e1cb..b46386803c 100644
--- a/test/scons-time/run/config/subdir.py
+++ b/test/scons-time/run/config/subdir.py
@@ -63,9 +63,3 @@ def re_find(content, line):
 test.must_contain_all_lines(content, expect, 'foo-000-0.log', re_find)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/targets.py b/test/scons-time/run/config/targets.py
index 5770713e67..fe89905231 100644
--- a/test/scons-time/run/config/targets.py
+++ b/test/scons-time/run/config/targets.py
@@ -84,9 +84,3 @@
 test.must_match('foo-000-2.log', expect, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/help.py b/test/scons-time/run/option/help.py
index d7f2b296a2..00a4eb735d 100644
--- a/test/scons-time/run/option/help.py
+++ b/test/scons-time/run/option/help.py
@@ -57,9 +57,3 @@
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/next-run.py b/test/scons-time/run/option/next-run.py
index 7e729cb160..8a2393937c 100644
--- a/test/scons-time/run/option/next-run.py
+++ b/test/scons-time/run/option/next-run.py
@@ -97,9 +97,3 @@
                     'foo-003-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/no-args.py b/test/scons-time/run/option/no-args.py
index e01f24bd53..520b27dfe1 100644
--- a/test/scons-time/run/option/no-args.py
+++ b/test/scons-time/run/option/no-args.py
@@ -40,9 +40,3 @@
 test.run(arguments = 'run', status = 1, stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/no-exec.py b/test/scons-time/run/option/no-exec.py
index db6757cf3d..a2eab7468a 100644
--- a/test/scons-time/run/option/no-exec.py
+++ b/test/scons-time/run/option/no-exec.py
@@ -47,9 +47,3 @@
                     'foo-000-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/number.py b/test/scons-time/run/option/number.py
index 0e87c2d257..ddf2d8669e 100644
--- a/test/scons-time/run/option/number.py
+++ b/test/scons-time/run/option/number.py
@@ -46,9 +46,3 @@
                 'foo-077-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/outdir.py b/test/scons-time/run/option/outdir.py
index a067bc02ad..5cca49b5d6 100644
--- a/test/scons-time/run/option/outdir.py
+++ b/test/scons-time/run/option/outdir.py
@@ -47,9 +47,3 @@
                 ['sub', 'foo-000-2.prof'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/prefix.py b/test/scons-time/run/option/prefix.py
index df13cd03a7..6bc96197e4 100644
--- a/test/scons-time/run/option/prefix.py
+++ b/test/scons-time/run/option/prefix.py
@@ -46,9 +46,3 @@
                 'bar-000-2.prof')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/python.py b/test/scons-time/run/option/python.py
index 463a2a6bba..dab12d02a0 100644
--- a/test/scons-time/run/option/python.py
+++ b/test/scons-time/run/option/python.py
@@ -69,9 +69,3 @@
 test.must_match('foo-000-2.log', "my_python.py: %s\n" % prof2, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/quiet.py b/test/scons-time/run/option/quiet.py
index d3e0eda966..c15308080f 100644
--- a/test/scons-time/run/option/quiet.py
+++ b/test/scons-time/run/option/quiet.py
@@ -76,9 +76,3 @@
 test.run(arguments='run --quiet foo.tar.gz', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/scons.py b/test/scons-time/run/option/scons.py
index e2479c3b26..98439278b0 100644
--- a/test/scons-time/run/option/scons.py
+++ b/test/scons-time/run/option/scons.py
@@ -57,9 +57,3 @@
 test.must_match('foo-000-2.log', "my_scons.py: %s\n" % prof2, mode='r')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/subdir.py b/test/scons-time/run/option/subdir.py
index ef8bc81eca..eeae750b8c 100644
--- a/test/scons-time/run/option/subdir.py
+++ b/test/scons-time/run/option/subdir.py
@@ -59,9 +59,3 @@ def re_find(content, line):
 test.must_contain_all_lines(content, expect, 'foo-000-0.log', re_find)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/verbose.py b/test/scons-time/run/option/verbose.py
index bf8d48f627..c3645d33bc 100644
--- a/test/scons-time/run/option/verbose.py
+++ b/test/scons-time/run/option/verbose.py
@@ -147,9 +147,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/chdir.py b/test/scons-time/time/chdir.py
index 762de75977..c461e5e6d6 100644
--- a/test/scons-time/time/chdir.py
+++ b/test/scons-time/time/chdir.py
@@ -55,9 +55,3 @@
 test.run(arguments = 'time --chdir logs foo-?.log', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/empty.py b/test/scons-time/time/empty.py
index a59a014c04..ecaa94bd7f 100644
--- a/test/scons-time/time/empty.py
+++ b/test/scons-time/time/empty.py
@@ -89,9 +89,3 @@
          stderr = stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/file.py b/test/scons-time/time/file.py
index 4c3271b0e4..96bd035bce 100644
--- a/test/scons-time/time/file.py
+++ b/test/scons-time/time/file.py
@@ -76,9 +76,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/format-gnuplot.py b/test/scons-time/time/format-gnuplot.py
index 7b38626f22..8a599a48b7 100644
--- a/test/scons-time/time/format-gnuplot.py
+++ b/test/scons-time/time/format-gnuplot.py
@@ -70,9 +70,3 @@
 test.run(arguments = 'time --format=gnuplot', stdout=expect_notitle)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/help.py b/test/scons-time/time/help.py
index 3df60f79ff..aec4c6fe77 100644
--- a/test/scons-time/time/help.py
+++ b/test/scons-time/time/help.py
@@ -55,9 +55,3 @@
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/no-args.py b/test/scons-time/time/no-args.py
index 56ed4a1a1a..510b1b328a 100644
--- a/test/scons-time/time/no-args.py
+++ b/test/scons-time/time/no-args.py
@@ -41,9 +41,3 @@
 test.run(arguments = 'mem', status = 1, stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/no-result.py b/test/scons-time/time/no-result.py
index fbd2de928f..6a666260d6 100644
--- a/test/scons-time/time/no-result.py
+++ b/test/scons-time/time/no-result.py
@@ -73,9 +73,3 @@
          stderr = stderr)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/prefix.py b/test/scons-time/time/prefix.py
index 00a1f52e34..6a0d764e7b 100644
--- a/test/scons-time/time/prefix.py
+++ b/test/scons-time/time/prefix.py
@@ -60,9 +60,3 @@
 test.run(arguments = 'time --prefix=foo', stdout = foo_expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/tail.py b/test/scons-time/time/tail.py
index c89f9046f2..7918dd1a27 100644
--- a/test/scons-time/time/tail.py
+++ b/test/scons-time/time/tail.py
@@ -53,9 +53,3 @@
 test.run(arguments = 'time --tail 5 foo-*.log', stdout = ''.join(expect5))
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/timeglob.py b/test/scons-time/time/timeglob.py
index 1a76d9fc19..fd870df7cc 100644
--- a/test/scons-time/time/timeglob.py
+++ b/test/scons-time/time/timeglob.py
@@ -50,9 +50,3 @@
 test.run(arguments = 'time foo-?.log', stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/which.py b/test/scons-time/time/which.py
index 170ce49d46..30ce3a620a 100644
--- a/test/scons-time/time/which.py
+++ b/test/scons-time/time/which.py
@@ -82,9 +82,3 @@
          stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/unknown.py b/test/scons-time/unknown.py
index 7cb3370b89..cee07c4ac7 100644
--- a/test/scons-time/unknown.py
+++ b/test/scons-time/unknown.py
@@ -42,9 +42,3 @@
 test.run(arguments = 'unknown', status=1, stderr=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/corrupt.py b/test/sconsign/corrupt.py
index 301fd1b852..966cee5001 100644
--- a/test/sconsign/corrupt.py
+++ b/test/sconsign/corrupt.py
@@ -103,9 +103,3 @@ def build1(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/ghost-entries.py b/test/sconsign/ghost-entries.py
index 2c9c98c035..43a61c5915 100644
--- a/test/sconsign/ghost-entries.py
+++ b/test/sconsign/ghost-entries.py
@@ -109,9 +109,3 @@ def cat(target, source, env):
 test.run(arguments='-Q pass=2', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/nonwritable.py b/test/sconsign/nonwritable.py
index ee7b13eb95..cba938310e 100644
--- a/test/sconsign/nonwritable.py
+++ b/test/sconsign/nonwritable.py
@@ -107,9 +107,3 @@ def build2(target, source, env):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py
index 6b064b1ee8..a315c42646 100644
--- a/test/sconsign/script/Configure.py
+++ b/test/sconsign/script/Configure.py
@@ -98,9 +98,3 @@
                   stdout = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/SConsignFile.py b/test/sconsign/script/SConsignFile.py
index 6361ff30e8..fbbac88189 100644
--- a/test/sconsign/script/SConsignFile.py
+++ b/test/sconsign/script/SConsignFile.py
@@ -485,9 +485,3 @@ def process(infp, outfp):
 #""" % locals())
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/Signatures.py b/test/sconsign/script/Signatures.py
index a355068de3..e1b2f21184 100644
--- a/test/sconsign/script/Signatures.py
+++ b/test/sconsign/script/Signatures.py
@@ -194,9 +194,3 @@ def process(infp, outfp):
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/bad.py b/test/sconsign/script/bad.py
index 5be42b9859..521607bcb0 100644
--- a/test/sconsign/script/bad.py
+++ b/test/sconsign/script/bad.py
@@ -59,9 +59,3 @@
          stderr = "sconsign: ignoring invalid .sconsign file `bad3'.*\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/dblite.py b/test/sconsign/script/dblite.py
index 0d05d5522c..ecd3d0a993 100644
--- a/test/sconsign/script/dblite.py
+++ b/test/sconsign/script/dblite.py
@@ -158,9 +158,3 @@ def escape_drive_case(s):
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/no-SConsignFile.py b/test/sconsign/script/no-SConsignFile.py
index 5760bf230f..55a3cda456 100644
--- a/test/sconsign/script/no-SConsignFile.py
+++ b/test/sconsign/script/no-SConsignFile.py
@@ -319,9 +319,3 @@ def process(infp, outfp):
 """ % locals())
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/signature-order.py b/test/signature-order.py
index 6d7516cdcd..b531405d9a 100644
--- a/test/signature-order.py
+++ b/test/signature-order.py
@@ -29,7 +29,7 @@
 Verify that we do rebuild things when the contents of
 two .h files are swapped, changing the order in which
 dependency signatures show up in the calculated list,
-but 
+but
 
 """
 
@@ -129,9 +129,3 @@
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/silent-command.py b/test/silent-command.py
index 3622a0428c..6cbcc49a91 100644
--- a/test/silent-command.py
+++ b/test/silent-command.py
@@ -79,9 +79,3 @@
 test.must_match('f7.out', "f7.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/basic.py b/test/site_scons/basic.py
index ea6bca6f00..c30383cb07 100644
--- a/test/site_scons/basic.py
+++ b/test/site_scons/basic.py
@@ -66,9 +66,3 @@ def exists(env):
 test.pass_test()
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/no-site-dir.py b/test/site_scons/no-site-dir.py
index a8477eef24..8cfe262f61 100644
--- a/test/site_scons/no-site-dir.py
+++ b/test/site_scons/no-site-dir.py
@@ -84,9 +84,3 @@ def exists(env):
 test.pass_test()
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/nonexistent.py b/test/site_scons/nonexistent.py
index 5ed14cb198..133f78637b 100644
--- a/test/site_scons/nonexistent.py
+++ b/test/site_scons/nonexistent.py
@@ -36,7 +36,7 @@
 
 test.run(arguments = '-Q --site-dir=whatever .',
          stderr = r".*site dir .*whatever not found.*",
-         status = 2, 
+         status = 2,
          match = TestSCons.match_re_dotall)
 
 
@@ -44,9 +44,3 @@
 test.pass_test()
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/override.py b/test/site_scons/override.py
index e564547814..2ff1fc915f 100644
--- a/test/site_scons/override.py
+++ b/test/site_scons/override.py
@@ -59,9 +59,3 @@ def exists(env):
 test.pass_test()
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/site-dir.py b/test/site_scons/site-dir.py
index 9a00d9173a..533bbbb582 100644
--- a/test/site_scons/site-dir.py
+++ b/test/site_scons/site-dir.py
@@ -113,9 +113,3 @@ def exists(env):
 test.pass_test()
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/site_init.py b/test/site_scons/site_init.py
index 743efa712f..9602d11d82 100644
--- a/test/site_scons/site_init.py
+++ b/test/site_scons/site_init.py
@@ -132,9 +132,3 @@ def TOOL_FOO(env):
 test.pass_test()
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/sys-path.py b/test/site_scons/sys-path.py
index 68473cafbc..516a17dfe0 100644
--- a/test/site_scons/sys-path.py
+++ b/test/site_scons/sys-path.py
@@ -60,9 +60,3 @@
 test.pass_test()
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/sysdirs.py b/test/site_scons/sysdirs.py
index d623ab2ac9..f809f1371d 100644
--- a/test/site_scons/sysdirs.py
+++ b/test/site_scons/sysdirs.py
@@ -64,9 +64,3 @@
 test.pass_test()
 
 # end of file
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/skip-execution.py b/test/skip-execution.py
index fbb885acbd..50cef7943e 100644
--- a/test/skip-execution.py
+++ b/test/skip-execution.py
@@ -60,9 +60,3 @@
 test.must_exist('a')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/spaces.py b/test/spaces.py
index 1309047473..c8c200c362 100644
--- a/test/spaces.py
+++ b/test/spaces.py
@@ -37,7 +37,7 @@
     test.write('duplicate a file.sh', 'cp foo.in foo.out\n')
     copy = test.workpath('duplicate a file.sh')
     os.chmod(test.workpath('duplicate a file.sh'), 0o777)
-    
+
 
 test.write('SConstruct', r'''
 env=Environment()
@@ -60,9 +60,3 @@
 test.run(arguments='foo.out')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/special-filenames.py b/test/special-filenames.py
index 6ae7afdd24..c3fe44814d 100644
--- a/test/special-filenames.py
+++ b/test/special-filenames.py
@@ -81,9 +81,3 @@ def buildFileStr(fn):
     test.fail_test(test.read(out_name, mode='r') != fn + '\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/srcchange.py b/test/srcchange.py
index 2eac09d743..ac29e2355e 100644
--- a/test/srcchange.py
+++ b/test/srcchange.py
@@ -105,9 +105,3 @@ def subrevision(target, source ,env):
 test.run(program=test.workpath(program_name), stdout='Revision $REV: 3.3$\n')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/strfunction.py b/test/strfunction.py
index 04e23aae59..e38ed73454 100644
--- a/test/strfunction.py
+++ b/test/strfunction.py
@@ -170,9 +170,3 @@ def func(target, source, env):
 test.run(arguments = '.', stdout=expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/subclassing.py b/test/subclassing.py
index ab4c7d5764..b931f8abd3 100644
--- a/test/subclassing.py
+++ b/test/subclassing.py
@@ -80,9 +80,3 @@ class mystr(UserString):
 test.must_match(['install', 'f2.out'], "f2.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/subdir.py b/test/subdir.py
index c5bfcdc2fe..87131c8079 100644
--- a/test/subdir.py
+++ b/test/subdir.py
@@ -62,9 +62,3 @@
 test.up_to_date(arguments = 'subdir')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/subdivide.py b/test/subdivide.py
index 4ba44482c3..cc334e265d 100644
--- a/test/subdivide.py
+++ b/test/subdivide.py
@@ -141,9 +141,3 @@
 test.up_to_date(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/suffixes.py b/test/suffixes.py
index a7a2c9d65f..4eae9d9f39 100644
--- a/test/suffixes.py
+++ b/test/suffixes.py
@@ -59,9 +59,3 @@ def cat(env, source, target):
 test.must_match('file4.123.out', "file4.in\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/symlink/VariantDir.py b/test/symlink/VariantDir.py
index d27a4ddcf5..7a76d16423 100644
--- a/test/symlink/VariantDir.py
+++ b/test/symlink/VariantDir.py
@@ -65,9 +65,3 @@
 test.run(arguments = '.')
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/symlink/dangling-include.py b/test/symlink/dangling-include.py
index 081573f6bf..8eddc86fba 100644
--- a/test/symlink/dangling-include.py
+++ b/test/symlink/dangling-include.py
@@ -52,13 +52,7 @@
 scons: \\*\\*\\* \\[foo.o(bj)?\\] Implicit dependency `foo.h' not found, needed by target `%s'.(  Stop.)?
 """% foo_obj
 
-test.run(arguments = '.', status = 2, stderr = expect, 
+test.run(arguments = '.', status = 2, stderr = expect,
          match=TestSCons.match_re_dotall)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/symlink/dangling-source.py b/test/symlink/dangling-source.py
index 94690f457e..5e90236d6e 100644
--- a/test/symlink/dangling-source.py
+++ b/test/symlink/dangling-source.py
@@ -49,9 +49,3 @@
 test.run(arguments = '.', status = 2, stderr = expect)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/timestamp-fallback.py b/test/timestamp-fallback.py
index d3f6774a09..e0bc9ca972 100644
--- a/test/timestamp-fallback.py
+++ b/test/timestamp-fallback.py
@@ -103,9 +103,3 @@ def build(env, target, source):
 
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/tool_args.py b/test/tool_args.py
index 464d009978..f97f56121d 100644
--- a/test/tool_args.py
+++ b/test/tool_args.py
@@ -69,9 +69,3 @@ def exists(env):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/toolpath/VariantDir.py b/test/toolpath/VariantDir.py
index 94376fc7c0..dbac876569 100644
--- a/test/toolpath/VariantDir.py
+++ b/test/toolpath/VariantDir.py
@@ -69,9 +69,3 @@ def exists(env):
 test.run()
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/toolpath/basic.py b/test/toolpath/basic.py
index 0d2429e912..cc71725bf6 100644
--- a/test/toolpath/basic.py
+++ b/test/toolpath/basic.py
@@ -162,9 +162,3 @@ def exists(env):
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/toolpath/nested/nested.py b/test/toolpath/nested/nested.py
index 47c0b037f8..e3d55e8ccc 100644
--- a/test/toolpath/nested/nested.py
+++ b/test/toolpath/nested/nested.py
@@ -66,9 +66,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/toolpath/relative_import/relative_import.py b/test/toolpath/relative_import/relative_import.py
index 43ae6cf30b..aa95d6ef66 100644
--- a/test/toolpath/relative_import/relative_import.py
+++ b/test/toolpath/relative_import/relative_import.py
@@ -44,9 +44,3 @@
 """)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/up-to-date.py b/test/up-to-date.py
index 12ea604afc..012832cc36 100644
--- a/test/up-to-date.py
+++ b/test/up-to-date.py
@@ -79,9 +79,3 @@
 test.must_contain_all_lines(test.stdout(), expected_lines)
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/update-release-info/update-release-info.py b/test/update-release-info/update-release-info.py
index bebd8a9875..8f6ef360b3 100644
--- a/test/update-release-info/update-release-info.py
+++ b/test/update-release-info/update-release-info.py
@@ -272,9 +272,3 @@ def updating_run(*args):
 # TODO:
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/virtualenv/activated/option/enable-virtualenv.py b/test/virtualenv/activated/option/enable-virtualenv.py
index 0ec2c92242..06f39baa6f 100644
--- a/test/virtualenv/activated/option/enable-virtualenv.py
+++ b/test/virtualenv/activated/option/enable-virtualenv.py
@@ -92,9 +92,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/virtualenv/activated/option/ignore-virtualenv.py b/test/virtualenv/activated/option/ignore-virtualenv.py
index d769ed20be..40c93c19f3 100644
--- a/test/virtualenv/activated/option/ignore-virtualenv.py
+++ b/test/virtualenv/activated/option/ignore-virtualenv.py
@@ -87,9 +87,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/virtualenv/activated/virtualenv_activated_python.py b/test/virtualenv/activated/virtualenv_activated_python.py
index f685c723d9..fb84104d84 100644
--- a/test/virtualenv/activated/virtualenv_activated_python.py
+++ b/test/virtualenv/activated/virtualenv_activated_python.py
@@ -96,9 +96,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/virtualenv/activated/virtualenv_detect_virtualenv.py b/test/virtualenv/activated/virtualenv_detect_virtualenv.py
index c7b5be5c31..b37c877c87 100644
--- a/test/virtualenv/activated/virtualenv_detect_virtualenv.py
+++ b/test/virtualenv/activated/virtualenv_detect_virtualenv.py
@@ -49,9 +49,3 @@
 test.must_contain_all_lines(test.stdout(), [f'virtualenv: {ve!r}'])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/virtualenv/always/virtualenv_global_function.py b/test/virtualenv/always/virtualenv_global_function.py
index 537aa98caf..6e3141878d 100644
--- a/test/virtualenv/always/virtualenv_global_function.py
+++ b/test/virtualenv/always/virtualenv_global_function.py
@@ -63,9 +63,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/virtualenv/regularenv/virtualenv_detect_regularenv.py b/test/virtualenv/regularenv/virtualenv_detect_regularenv.py
index dcbfc2e4d6..a38bb43625 100644
--- a/test/virtualenv/regularenv/virtualenv_detect_regularenv.py
+++ b/test/virtualenv/regularenv/virtualenv_detect_regularenv.py
@@ -48,9 +48,3 @@
 test.must_contain_all_lines(test.stdout(), ["virtualenv: ''"])
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/virtualenv/unactivated/virtualenv_unactivated_python.py b/test/virtualenv/unactivated/virtualenv_unactivated_python.py
index 266156c33b..780d11a44c 100644
--- a/test/virtualenv/unactivated/virtualenv_unactivated_python.py
+++ b/test/virtualenv/unactivated/virtualenv_unactivated_python.py
@@ -97,9 +97,3 @@
 )
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/warning-TargetNotBuiltWarning.py b/test/warning-TargetNotBuiltWarning.py
index 76fdc5cde0..77da2a6cbf 100644
--- a/test/warning-TargetNotBuiltWarning.py
+++ b/test/warning-TargetNotBuiltWarning.py
@@ -47,9 +47,3 @@
          stdout = "scons: `jim' is up to date.\n")
 
 test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py
index 6ac1275fc3..5c7de8049f 100644
--- a/testing/framework/TestCmd.py
+++ b/testing/framework/TestCmd.py
@@ -2176,10 +2176,3 @@ def write(self, file, content, mode: str = 'wb'):
                 f.write(content)
             except TypeError as e:
                 f.write(bytes(content, 'utf-8'))
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestCmdTests.py b/testing/framework/TestCmdTests.py
index 980aa98dc5..30aa681eb6 100644
--- a/testing/framework/TestCmdTests.py
+++ b/testing/framework/TestCmdTests.py
@@ -3770,9 +3770,3 @@ def test_variables(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestCommon.py b/testing/framework/TestCommon.py
index 0ee7f5d0e1..33a901399a 100644
--- a/testing/framework/TestCommon.py
+++ b/testing/framework/TestCommon.py
@@ -923,10 +923,3 @@ def detailed_diff(value, expect) -> str:
                 print(f"\n[{v}]\n[{e}]")
 
         return f"Expected:\n{expect}\nGot:\n{value}"
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestCommonTests.py b/testing/framework/TestCommonTests.py
index 4d4b96dfde..a928bee0e5 100644
--- a/testing/framework/TestCommonTests.py
+++ b/testing/framework/TestCommonTests.py
@@ -2494,10 +2494,3 @@ def test_variables(self) -> None:
 
 if __name__ == "__main__":
     unittest.main()
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestRuntest.py b/testing/framework/TestRuntest.py
index d277cc16e0..7a6447b602 100644
--- a/testing/framework/TestRuntest.py
+++ b/testing/framework/TestRuntest.py
@@ -172,10 +172,3 @@ def write_no_result_test(self, name) -> None:
 
     def write_passing_test(self, name) -> None:
         self.write(name, passing_test_template)
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py
index 8f2cabd778..3e7f4552b9 100644
--- a/testing/framework/TestSCons.py
+++ b/testing/framework/TestSCons.py
@@ -2220,9 +2220,3 @@ def up_to_date(self, arguments: str = '.', read_str: str = "", **kw) -> None:
 # test/AR.py for sample usage).
 
 noisy_ar = r'(ar: creating( archive)? \S+\n?)*'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestSConsMSVS.py b/testing/framework/TestSConsMSVS.py
index f5154dec00..0c4b510d21 100644
--- a/testing/framework/TestSConsMSVS.py
+++ b/testing/framework/TestSConsMSVS.py
@@ -1275,10 +1275,3 @@ def get_expected_projects_sconscript_file_contents(
                 }
             )
         return format % values
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestSConsTar.py b/testing/framework/TestSConsTar.py
index 11b4524135..1c3e0490d2 100644
--- a/testing/framework/TestSConsTar.py
+++ b/testing/framework/TestSConsTar.py
@@ -165,9 +165,3 @@ def windows_system_tar_lzma(tar):
 
 class TestSConsTar(TestSCons):
     pass
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestSCons_time.py b/testing/framework/TestSCons_time.py
index 883c20f9c7..be447e17c5 100644
--- a/testing/framework/TestSCons_time.py
+++ b/testing/framework/TestSCons_time.py
@@ -339,10 +339,3 @@ def write_sample_project(self, archive, dir=None):
         path = write_sample(archive, dir, self.sample_project_files)
 
         return path
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestSConsign.py b/testing/framework/TestSConsign.py
index 18dd333dbd..f84ed53881 100644
--- a/testing/framework/TestSConsign.py
+++ b/testing/framework/TestSConsign.py
@@ -100,10 +100,3 @@ def set_sconsign(self, sconsign) -> None:
     def run_sconsign(self, *args, **kw):
         kw.update(self.my_kw)
         return self.run(*args, **kw)
-
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/timings/SCons_Bars.py b/timings/SCons_Bars.py
index 2b677e94f0..e31b532f37 100644
--- a/timings/SCons_Bars.py
+++ b/timings/SCons_Bars.py
@@ -55,17 +55,17 @@ def gnuplot(self, color=None, labels=False, revs=None):
 Release_Bars = Bars(
     color = 7,
     dict = {
-        1232 : '0.96.90', 
-        1344 : '0.96.91', 
-        1435 : '0.96.92', 
-        1674 : '0.96.93', 
-        1765 : '0.96.94', 
-        1835 : '0.96.95', 
-        1882 : '0.96.96', 
-        1901 : '0.97', 
-        2242 : '0.97.0d20070809', 
-        2454 : '0.97.0d20070918', 
-        2527 : '0.97.0d20071212', 
+        1232 : '0.96.90',
+        1344 : '0.96.91',
+        1435 : '0.96.92',
+        1674 : '0.96.93',
+        1765 : '0.96.94',
+        1835 : '0.96.95',
+        1882 : '0.96.96',
+        1901 : '0.97',
+        2242 : '0.97.0d20070809',
+        2454 : '0.97.0d20070918',
+        2527 : '0.97.0d20071212',
     },
 )
 
@@ -115,9 +115,3 @@ def gnuplot(self, color=None, labels=False, revs=None):
         2380 : 'The Big Signature Refactoring hits branches/core.',
     },
 )
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4: