diff --git a/test/begin_end.cpp b/test/begin_end.cpp
index db4d8246..e6a67777 100644
--- a/test/begin_end.cpp
+++ b/test/begin_end.cpp
@@ -1,4 +1,8 @@
-/** -*- c++ -*- \file begin_end.hpp \brief Test the \c begin and \c end operations. */
+//  Copyright (c) 2011 David Bellot
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <cmath>
 #include <boost/numeric/ublas/traits/const_iterator_type.hpp>
diff --git a/test/comp_mat_erase.cpp b/test/comp_mat_erase.cpp
index 9c51f79f..84509362 100644
--- a/test/comp_mat_erase.cpp
+++ b/test/comp_mat_erase.cpp
@@ -1,3 +1,9 @@
+//  Copyright (c) 2011 David Bellot
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
 #include "boost/numeric/ublas/matrix_sparse.hpp"
 
 #define BOOST_TEST_MODULE SparseMatrixErasureTest
diff --git a/test/num_columns.cpp b/test/num_columns.cpp
index 91a9e04a..568d4f2e 100644
--- a/test/num_columns.cpp
+++ b/test/num_columns.cpp
@@ -1,4 +1,8 @@
-/** -*- c++ -*- \file num_columns.cpp \breif Test for the \c num_columns operation. */
+//  Copyright (c) 2011 David Bellot
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/numeric/ublas/fwd.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
diff --git a/test/num_rows.cpp b/test/num_rows.cpp
index f0146608..4a96bd2f 100644
--- a/test/num_rows.cpp
+++ b/test/num_rows.cpp
@@ -1,4 +1,8 @@
-/** -*- c++ -*- \file num_rows.hpp \file Test the \c num_rows operation. */
+//  Copyright (c) 2011 David Bellot
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/numeric/ublas/fwd.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
diff --git a/test/size.cpp b/test/size.cpp
index 327081dd..5976caab 100644
--- a/test/size.cpp
+++ b/test/size.cpp
@@ -1,4 +1,8 @@
-/** -*- c++ -*- \file size.hpp \brief Test the \c size operation. */
+//  Copyright (c) 2011 David Bellot
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/numeric/ublas/fwd.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
diff --git a/test/sparse_view_test.cpp b/test/sparse_view_test.cpp
index ce4602c6..178e4442 100644
--- a/test/sparse_view_test.cpp
+++ b/test/sparse_view_test.cpp
@@ -1,9 +1,8 @@
-
-/* Test program to test find functions of triagular matrices
- *
- * author: Gunter Winkler ( guwi17 at gmx dot de )
- */
-
+//  Copyright (c) 2009-2011 Gunter Winkler, David Bellot
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
 // ublas headers
 
diff --git a/test/test11.cpp b/test/test11.cpp
index 7aebb975..2d3d2752 100644
--- a/test/test11.cpp
+++ b/test/test11.cpp
@@ -1,4 +1,3 @@
-//
 //  Copyright (c) 2000-2002
 //  Joerg Walter, Mathias Koch
 //
@@ -8,7 +7,6 @@
 //
 //  The authors gratefully acknowledge the support of
 //  GeNeSys mbH & Co. KG in producing this work.
-//
 
 #include "test1.hpp"
 
diff --git a/test/test_coordinate_matrix_sort.cpp b/test/test_coordinate_matrix_sort.cpp
index afa58b45..bf927fc5 100644
--- a/test/test_coordinate_matrix_sort.cpp
+++ b/test/test_coordinate_matrix_sort.cpp
@@ -1,3 +1,9 @@
+//  Copyright (c) 2011 David Bellot
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
 #ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
 # define BOOST_UBLAS_NO_ELEMENT_PROXIES
 #endif
diff --git a/test/utils.hpp b/test/utils.hpp
index c0526ce8..8d726283 100644
--- a/test/utils.hpp
+++ b/test/utils.hpp
@@ -1,4 +1,8 @@
-/** -*- c++ -*- \file utils.hpp \brief Test utilities. */
+//  Copyright (c) 2011 David Bellot
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef TEST_UTILS_HPP
 #define TEST_UTILS_HPP