diff --git a/test/Jamfile b/test/Jamfile
index 1b9a73df8..9d186f3c1 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -1,3 +1,7 @@
+# Copyright 2001 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 
 # establish a project root right here in the test directory, so that we can test
 # things independently of the boost jambase, etc.
diff --git a/test/absolute_sources.py b/test/absolute_sources.py
index a7664be0e..cd658765e 100644
--- a/test/absolute_sources.py
+++ b/test/absolute_sources.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test that sources with absolute names are handled OK.
 
 from BoostBuild import Tester
diff --git a/test/alias.py b/test/alias.py
index 1a68ec559..a4f1be260 100644
--- a/test/alias.py
+++ b/test/alias.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester, List
 t = Tester()
 
diff --git a/test/alternatives.py b/test/alternatives.py
index 0c1d91abb..9d10c6f1d 100644
--- a/test/alternatives.py
+++ b/test/alternatives.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2003, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test main target alternatives.
 
 from BoostBuild import Tester
diff --git a/test/assert-equal.jam b/test/assert-equal.jam
index 0c1229f8a..6ed501e74 100644
--- a/test/assert-equal.jam
+++ b/test/assert-equal.jam
@@ -1,3 +1,7 @@
+# Copyright 2001 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Evaluates [ rulename arg1... : arg2... : ... : argN... ] and compares the
 # result to expected-results. If there is a mismatch, prints an error message
 # and exits.
diff --git a/test/bad_dirname.py b/test/bad_dirname.py
index 57e43abd7..c6c2ead49 100644
--- a/test/bad_dirname.py
+++ b/test/bad_dirname.py
@@ -1,10 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
-
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Regression test: when directory of project root contained regex metacharacters,
 #  Boost.Build failed to work. Bug reported by Michael Stevens
diff --git a/test/boost-build.jam b/test/boost-build.jam
index 63431b2a2..ad68a288e 100644
--- a/test/boost-build.jam
+++ b/test/boost-build.jam
@@ -1,3 +1,7 @@
+# Copyright 2002, 2003 Dave Abrahams 
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 # Assume BOOST_BUILD_PATH point to the 'test' directory.
 # We need to leave 'test' there, so that 'test-config.jam'
diff --git a/test/boostbook.py b/test/boostbook.py
index 5e07f1e09..17edc636c 100644
--- a/test/boostbook.py
+++ b/test/boostbook.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2004. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2004, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 
diff --git a/test/build_dir.py b/test/build_dir.py
index 5bfe5b0df..578e498c3 100644
--- a/test/build_dir.py
+++ b/test/build_dir.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2005 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test that we can change build directory using 
 # the 'build-dir' project attribute.
 
diff --git a/test/c_file.py b/test/c_file.py
index 0239673b2..cf6121e9d 100644
--- a/test/c_file.py
+++ b/test/c_file.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that C files are compiled by C compiler
 from BoostBuild import Tester, List
diff --git a/test/chain.py b/test/chain.py
index 2cd8e17d9..b11979928 100644
--- a/test/chain.py
+++ b/test/chain.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This tests that 
 # 1) the 'make' correctly assigns types to produced targets
 # 2) than if 'make' create targets of type CPP, they are
diff --git a/test/check-arguments.jam b/test/check-arguments.jam
index c87bf3a51..20e025074 100644
--- a/test/check-arguments.jam
+++ b/test/check-arguments.jam
@@ -1,8 +1,6 @@
-# (C) Copyright David Abrahams 2001. Permission to copy, use,
-# modify, sell and distribute this software is granted provided this
-# copyright notice appears in all copies. This software is provided
-# "as is" without express or implied warranty, and with no claim as
-# to its suitability for any purpose.
+# Copyright 2001 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #
 # Jam code for testing the named-argument patch.
diff --git a/test/check-bindrule.jam b/test/check-bindrule.jam
index aecc77592..f8eb986e3 100644
--- a/test/check-bindrule.jam
+++ b/test/check-bindrule.jam
@@ -1,3 +1,7 @@
+# Copyright 2001 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This rule establishes a dependency, with no special build actions
 rule do-nothing ( target : source )
 {
@@ -22,4 +26,4 @@ rule bind-rule ( target : path )
     ECHO found: $(target) at $(path) ;
 }
 
-DEPENDS all : fake-target ;
\ No newline at end of file
+DEPENDS all : fake-target ;
diff --git a/test/check-jam-patches.jam b/test/check-jam-patches.jam
index 8f88ae254..7e00bec20 100644
--- a/test/check-jam-patches.jam
+++ b/test/check-jam-patches.jam
@@ -1,3 +1,7 @@
+# Copyright 2001, 2002 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Get the recursive Jam invocation code
 include recursive.jam ;
 include assert-equal.jam ;
@@ -286,4 +290,4 @@ assert-equal x y x-y
         }
     }
     module1.f ;
-}
\ No newline at end of file
+}
diff --git a/test/check-test-tools.jam b/test/check-test-tools.jam
index ac03aa505..adf78cc3b 100644
--- a/test/check-test-tools.jam
+++ b/test/check-test-tools.jam
@@ -1,3 +1,7 @@
+# Copyright 2001 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 include recursive.jam ;
 include assert-equal.jam ;
 
diff --git a/test/composite.py b/test/composite.py
index 7faeba419..d1a795be7 100644
--- a/test/composite.py
+++ b/test/composite.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that composite properties are handled correctly.
 from BoostBuild import Tester, List
diff --git a/test/conditionals.py b/test/conditionals.py
index 63afe173e..ec31d4412 100644
--- a/test/conditionals.py
+++ b/test/conditionals.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test conditional properties
 
 from BoostBuild import Tester, List
diff --git a/test/conditionals2.py b/test/conditionals2.py
index 3145a14d2..88877573a 100644
--- a/test/conditionals2.py
+++ b/test/conditionals2.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Regression test: it was possible that due to evaluation of conditional
 #  requirements, two different values of non-free features were present in
diff --git a/test/conditionals3.py b/test/conditionals3.py
index 9e6c2b88b..fefb97798 100644
--- a/test/conditionals3.py
+++ b/test/conditionals3.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that conditional properties work, even if property is free, and
 #  value includes colon.
diff --git a/test/core_d12.py b/test/core_d12.py
index 72ec9de53..94f3cdb33 100644
--- a/test/core_d12.py
+++ b/test/core_d12.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2002, 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This tests correct handling of "-d1" and "-d2" options.
 
 import BoostBuild
diff --git a/test/core_delete_module.py b/test/core_delete_module.py
index 92ac99906..6a5fa7c03 100644
--- a/test/core_delete_module.py
+++ b/test/core_delete_module.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This tests the facilities for deleting modules.
 
 import BoostBuild
diff --git a/test/core_dependencies.py b/test/core_dependencies.py
index 24155e416..ee6de2aba 100644
--- a/test/core_dependencies.py
+++ b/test/core_dependencies.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This tests correct handling of dependencies, specifically, on
 # generated sources, and from generated sources.
 
diff --git a/test/core_import_module.py b/test/core_import_module.py
index d4a1d5426..0f1d6cea1 100644
--- a/test/core_import_module.py
+++ b/test/core_import_module.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 
diff --git a/test/core_modifiers.py b/test/core_modifiers.py
index 69b9f7b1f..bebcc5fde 100644
--- a/test/core_modifiers.py
+++ b/test/core_modifiers.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This tests the "existing" and "updated" modifiers on actions.
 
 import BoostBuild
diff --git a/test/core_typecheck.py b/test/core_typecheck.py
index 2de82e686..31f408356 100644
--- a/test/core_typecheck.py
+++ b/test/core_typecheck.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This tests the typechecking facilities.
 
 import BoostBuild
diff --git a/test/core_varnames.py b/test/core_varnames.py
index 82fcf3c91..8e48bb3b8 100644
--- a/test/core_varnames.py
+++ b/test/core_varnames.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This tests the core rule for enumerating the variable names in a module
 
 import BoostBuild
diff --git a/test/custom_generator.py b/test/custom_generator.py
index 5a66daa35..7b73e2f22 100644
--- a/test/custom_generator.py
+++ b/test/custom_generator.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003, 2004, 2005 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 
 from BoostBuild import Tester, List
diff --git a/test/default_build.py b/test/default_build.py
index cde428e91..90a188aef 100644
--- a/test/default_build.py
+++ b/test/default_build.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test that default build clause actually has any effect.
 
 from BoostBuild import Tester, List
diff --git a/test/default_features.py b/test/default_features.py
index d01267ee6..2924d8dfc 100644
--- a/test/default_features.py
+++ b/test/default_features.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that features with default values are always present 
 #  in build properties of any target.
diff --git a/test/generators_test.py b/test/generators_test.py
index ca5d29840..209960845 100644
--- a/test/generators_test.py
+++ b/test/generators_test.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2005 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester, List
 import os
 
diff --git a/test/inherit_toolset.py b/test/inherit_toolset.py
index 947af6e46..1c95df68b 100644
--- a/test/inherit_toolset.py
+++ b/test/inherit_toolset.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 from string import find
diff --git a/test/inline.py b/test/inline.py
index 45f0a5b8c..39bfecd75 100644
--- a/test/inline.py
+++ b/test/inline.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 
diff --git a/test/library_chain.py b/test/library_chain.py
index f98de9646..e211b9baf 100644
--- a/test/library_chain.py
+++ b/test/library_chain.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003, 2004, 2005, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that a chain of libraries work ok, not matter if we use static or
 #  shared linking.
diff --git a/test/library_order.py b/test/library_order.py
index e6e4e2465..f5638a7ba 100644
--- a/test/library_order.py
+++ b/test/library_order.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2004. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 import string
diff --git a/test/library_property.py b/test/library_property.py
index 1b95f7415..933e25aa8 100644
--- a/test/library_property.py
+++ b/test/library_property.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2004. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that the <library> property has no effect on "obj" targets.
 #  Previously, it affected all targets, so
diff --git a/test/loop.py b/test/loop.py
index 558e99cf8..f45ebea7c 100644
--- a/test/loop.py
+++ b/test/loop.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 from string import find
diff --git a/test/m1-01.py b/test/m1-01.py
index f9b0a3429..34d82db98 100644
--- a/test/m1-01.py
+++ b/test/m1-01.py
@@ -1,4 +1,9 @@
 #!/usr/bin/python
+
+# Copyright 2002 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test the very basic 'make' functionality.
 
 from BoostBuild import Tester, List
diff --git a/test/m1-02.py b/test/m1-02.py
index df5d66bc6..86e6312da 100644
--- a/test/m1-02.py
+++ b/test/m1-02.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2002 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Tests that 'make' accepts target from other directories and that
 # build request for those targets can be overriden.
 
diff --git a/test/m1-03.py b/test/m1-03.py
index 4dc9db372..15b0ff0ed 100644
--- a/test/m1-03.py
+++ b/test/m1-03.py
@@ -1,4 +1,9 @@
 #!/usr/bin/python
+
+# Copyright 2002 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Tests that we can use objects from other projects
 # (i.e. with other project root)
 # Test also that we can refer to those target using project-id.
diff --git a/test/make_rule.py b/test/make_rule.py
index 6ee423774..c204d7a40 100644
--- a/test/make_rule.py
+++ b/test/make_rule.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2003, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test the 'make' rule
 
 from BoostBuild import Tester
diff --git a/test/module_actions.py b/test/module_actions.py
index f0c4315f8..c35fb0ba5 100644
--- a/test/module_actions.py
+++ b/test/module_actions.py
@@ -1,5 +1,11 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2006 Rene Rivera 
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester, List
 import os
 import re
diff --git a/test/ndebug.py b/test/ndebug.py
index 1d7179cbe..b4d071f80 100644
--- a/test/ndebug.py
+++ b/test/ndebug.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that building with optimization brings NDEBUG define, and, more
 #  importantly, that dependency targets are built with NDEBUG as well,
diff --git a/test/no_type.py b/test/no_type.py
index fbf6f6661..509e93538 100644
--- a/test/no_type.py
+++ b/test/no_type.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2002 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test that we cannot specify targets of unknown type as sources.
 # This is based on the fact that Unix 'ar' will happily consume
 # just about anything.
diff --git a/test/ordered_properties.py b/test/ordered_properties.py
index 0fe448fb9..3025acfba 100644
--- a/test/ordered_properties.py
+++ b/test/ordered_properties.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2004. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  This file is template for Boost.Build tests. It creates a simple
 #  project that builds one exe from one source, and checks that the exe
diff --git a/test/path_features.py b/test/path_features.py
index 7640e4a04..582b05e7e 100644
--- a/test/path_features.py
+++ b/test/path_features.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester
 t = Tester()
 
diff --git a/test/prebuilt.py b/test/prebuilt.py
index 5f367eb56..58590aae7 100644
--- a/test/prebuilt.py
+++ b/test/prebuilt.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test that we can use already built sources
 
 from BoostBuild import Tester
diff --git a/test/print.py b/test/print.py
index 77d83f619..62d2c7260 100644
--- a/test/print.py
+++ b/test/print.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Douglas Gregor 
+# Copyright 2005 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester, List
 
 t = Tester()
diff --git a/test/project-test1.jam b/test/project-test1.jam
index 9fe1ab988..c2d6ae576 100644
--- a/test/project-test1.jam
+++ b/test/project-test1.jam
@@ -1,3 +1,9 @@
+# Copyright 2002, 2003 Dave Abrahams 
+# Copyright 2002 Rene Rivera 
+# Copyright 2002, 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 import project ;
 import targets ;
 import assert ;
diff --git a/test/project_dependencies.py b/test/project_dependencies.py
index a59a50bf5..e0cdcb686 100644
--- a/test/project_dependencies.py
+++ b/test/project_dependencies.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test that we can specify a dependency property
 # in project requirements, and that it won't
 # cause every main target in the project to
diff --git a/test/project_root_constants.py b/test/project_root_constants.py
index 8642eb335..1129ed801 100644
--- a/test/project_root_constants.py
+++ b/test/project_root_constants.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003, 2004, 2005 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 from string import find
diff --git a/test/project_test1.py b/test/project_test1.py
index a0753c3e4..c4a3a8c2f 100644
--- a/test/project_test1.py
+++ b/test/project_test1.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2002 Dave Abrahams 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester
 import os
 
diff --git a/test/project_test3.py b/test/project_test3.py
index d8d4b57e0..cd1afadc7 100644
--- a/test/project_test3.py
+++ b/test/project_test3.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2002, 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2004, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester, List
 import os
 from string import strip
diff --git a/test/project_test4.py b/test/project_test4.py
index 60ccb1220..ec735df0f 100644
--- a/test/project_test4.py
+++ b/test/project_test4.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester
 import os
 from string import strip, find
diff --git a/test/property_expansion.py b/test/property_expansion.py
index fce792b80..2371d87bd 100644
--- a/test/property_expansion.py
+++ b/test/property_expansion.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 
diff --git a/test/railsys.py b/test/railsys.py
index 1581a0e31..10db5c3a0 100644
--- a/test/railsys.py
+++ b/test/railsys.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 
diff --git a/test/rebuilds.py b/test/rebuilds.py
index ce63117f2..87c4d26da 100644
--- a/test/rebuilds.py
+++ b/test/rebuilds.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2005 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # This tests the typechecking facilities.
 
 import BoostBuild
diff --git a/test/recursive.jam b/test/recursive.jam
index b83649e64..8087f7da7 100644
--- a/test/recursive.jam
+++ b/test/recursive.jam
@@ -1,8 +1,7 @@
-# (C) Copyright David Abrahams 2001. Permission to copy, use,
-# modify, sell and distribute this software is granted provided this
-# copyright notice appears in all copies. This software is provided
-# "as is" without express or implied warranty, and with no claim as
-# to its suitability for any purpose.
+# Copyright 2001, 2002 Dave Abrahams 
+# Copyright 2005 Rene Rivera 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 ##############################################################
 # Rules and actions that test Jam by invoking it recursively #
diff --git a/test/relative_sources.py b/test/relative_sources.py
index 8bab211ad..e03f999bc 100644
--- a/test/relative_sources.py
+++ b/test/relative_sources.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test that we can specify sources using relative names.
 
 from BoostBuild import Tester
diff --git a/test/searched_lib.py b/test/searched_lib.py
index 353d21dea..9e3ea7f48 100644
--- a/test/searched_lib.py
+++ b/test/searched_lib.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2003, 2004, 2005, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test usage of searched-libs: one which are found via -l
 # switch to the linker/compiler. 
 
diff --git a/test/skipping.py b/test/skipping.py
index 34e41066c..0c74a89f4 100644
--- a/test/skipping.py
+++ b/test/skipping.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that V2 does not fail gracelessy when any target is skipped.
 from BoostBuild import Tester, List
diff --git a/test/stage.py b/test/stage.py
index e116baffd..ba7ff693f 100644
--- a/test/stage.py
+++ b/test/stage.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2004, 2005, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test staging
 
 from BoostBuild import Tester
diff --git a/test/standalone.py b/test/standalone.py
index 94e62593a..70a95ee88 100644
--- a/test/standalone.py
+++ b/test/standalone.py
@@ -1,10 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
-
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 
diff --git a/test/startup_v1.py b/test/startup_v1.py
index 2d80c8a02..3598c9351 100644
--- a/test/startup_v1.py
+++ b/test/startup_v1.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2002 Dave Abrahams 
+# Copyright 2003, 2004, 2005 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester
 import os
 import re
diff --git a/test/startup_v2.py b/test/startup_v2.py
index cdf31026a..abffbb828 100644
--- a/test/startup_v2.py
+++ b/test/startup_v2.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2002 Dave Abrahams 
+# Copyright 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester
 import os
 import re
diff --git a/test/suffix.py b/test/suffix.py
index 7a73feb1d..38b8ad2a3 100644
--- a/test/suffix.py
+++ b/test/suffix.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
 
diff --git a/test/symlink.py b/test/symlink.py
index 86fa0a06a..92c06248f 100644
--- a/test/symlink.py
+++ b/test/symlink.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test the 'symlink' rule
 
 from BoostBuild import Tester, List
diff --git a/test/test-config-example.jam b/test/test-config-example.jam
index 4e4822aab..b2f3170c5 100644
--- a/test/test-config-example.jam
+++ b/test/test-config-example.jam
@@ -1,3 +1,7 @@
+# Copyright 2004, 2005, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 
 # Skeleton for test configuration. If your local configuration 
 # interferes with testing, rename this files to 'test-system.jam'
@@ -12,4 +16,4 @@ using boostbook
      : /home/ghost/Store/docbook/dtd
      : /home/ghost/Work/boost-rc/tools/boostbook
      ; 
-using doxygen ;
\ No newline at end of file
+using doxygen ;
diff --git a/test/test.jam b/test/test.jam
index b3aa7bf89..5e1aae9bc 100644
--- a/test/test.jam
+++ b/test/test.jam
@@ -1,3 +1,9 @@
+# Copyright 2001, 2002, 2003 Dave Abrahams 
+# Copyright 2002 Rene Rivera 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 import indirect ;
 import string ;
 import numbers ;
diff --git a/test/test1.py b/test/test1.py
index d02ea29aa..9253269a9 100644
--- a/test/test1.py
+++ b/test/test1.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2002 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 import BoostBuild
 
 t = BoostBuild.Tester()
diff --git a/test/test2.py b/test/test2.py
index cb74b851f..b982d4001 100644
--- a/test/test2.py
+++ b/test/test2.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2002, 2003 Dave Abrahams 
+# Copyright 2002, 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester, List
 from time import sleep
 
diff --git a/test/test_nt_line_length.jam b/test/test_nt_line_length.jam
index 9fce71b97..bc003964e 100644
--- a/test/test_nt_line_length.jam
+++ b/test/test_nt_line_length.jam
@@ -1,8 +1,6 @@
-# (C) Copyright David Abrahams 2001. Permission to copy, use,
-# modify, sell and distribute this software is granted provided this
-# copyright notice appears in all copies. This software is provided
-# "as is" without express or implied warranty, and with no claim as
-# to its suitability for any purpose.
+# Copyright 2001 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 # Test that the patch which allows long command-lines in actions on NT is
 # working. For reasons of backward-compatibility, this patch requires that the
diff --git a/test/testing_primitives.py b/test/testing_primitives.py
index 8e8c04490..b2607390b 100644
--- a/test/testing_primitives.py
+++ b/test/testing_primitives.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2002 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester, List
 import os
 from string import strip
diff --git a/test/tree.py b/test/tree.py
index ade46718f..561f8e4f8 100644
--- a/test/tree.py
+++ b/test/tree.py
@@ -1,8 +1,7 @@
-# Copyright (C) 2001 Vladimir Prus. Permission to copy, use, modify, sell and
-# distribute this software is granted, provided this copyright notice appears
-# in all copies and modified versions are clearly marked as such. This software
-# is provided "as is" without express or implied warranty, and with no claim as
-# to is suitability for any purpose.
+# Copyright 2003 Dave Abrahams 
+# Copyright 2001, 2002 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 # This file is based in part on the content of svn_tree.py.
 
diff --git a/test/unit-tests.jam b/test/unit-tests.jam
index 67fdf5d8b..212f4c388 100644
--- a/test/unit-tests.jam
+++ b/test/unit-tests.jam
@@ -1,8 +1,6 @@
-# (C) Copyright David Abrahams 2001. Permission to copy, use,
-# modify, sell and distribute this software is granted provided this
-# copyright notice appears in all copies. This software is provided
-# "as is" without express or implied warranty, and with no claim as
-# to its suitability for any purpose.
+# Copyright 2001 Dave Abrahams 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 # assert_equal a : b
 #
@@ -261,4 +259,4 @@ assert_equal [ strip-initial a b c : ] :  ;
     $(gTOP)_TOKENS = .. .. ;
     assert_equal [ simplify-path-tokens .. .. d e : xxx ] : xxx ; 
     assert_equal [ simplify-path-tokens .. .. d e f g : xxx ] : f g ; 
-}
\ No newline at end of file
+}
diff --git a/test/unit_test.py b/test/unit_test.py
index 7184dc3a8..bb0d0474f 100644
--- a/test/unit_test.py
+++ b/test/unit_test.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test the unit_test rule
 from BoostBuild import Tester, List
diff --git a/test/unit_tests.py b/test/unit_tests.py
index a5e2af4e1..7da89f609 100644
--- a/test/unit_tests.py
+++ b/test/unit_tests.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2002, 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester
 
 t = Tester(pass_toolset=0)
diff --git a/test/unused.py b/test/unused.py
index c369983c1..976efed89 100644
--- a/test/unused.py
+++ b/test/unused.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 
+# Copyright 2003 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 # Test that unused sources are at least reported.
 
 from BoostBuild import Tester
diff --git a/test/use_requirements.py b/test/use_requirements.py
index fb40573af..679436e1a 100644
--- a/test/use_requirements.py
+++ b/test/use_requirements.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2003 Dave Abrahams 
+# Copyright 2002, 2003, 2004, 2006 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester
 t = Tester()
 
diff --git a/test/v1_testing.py b/test/v1_testing.py
index 77ffc47bf..b1de60fb1 100644
--- a/test/v1_testing.py
+++ b/test/v1_testing.py
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# Copyright 2002 Dave Abrahams 
+# Copyright 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
 from BoostBuild import Tester, List
 import os
 from string import strip
diff --git a/test/wrapper.py b/test/wrapper.py
index 345034f91..74e8516f0 100644
--- a/test/wrapper.py
+++ b/test/wrapper.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-#  Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
+# Copyright 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 #  Test that the user can define his own rule that will call builtin main
 #  target rule and that this will work.