diff --git a/modules/base/tests/test_generic_property.cc b/modules/base/tests/test_generic_property.cc
index 17632311a8ae45128463d7f05389ad6fde7e9caf..c30c1fc6ffd83058a386b6afc4f6855d5db6244d 100644
--- a/modules/base/tests/test_generic_property.cc
+++ b/modules/base/tests/test_generic_property.cc
@@ -19,7 +19,6 @@
 #define BOOST_TEST_DYN_LINK
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 
diff --git a/modules/base/tests/test_pod_vector.cc b/modules/base/tests/test_pod_vector.cc
index 0e7225cedd522e89e527b0ea643932b80ae37beb..3cf34fc4c511f06619bea27f09e78b3ab70fe292 100644
--- a/modules/base/tests/test_pod_vector.cc
+++ b/modules/base/tests/test_pod_vector.cc
@@ -22,7 +22,6 @@
 #include <ost/pod_vector.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 using namespace ost;
 
diff --git a/modules/base/tests/test_string_ref.cc b/modules/base/tests/test_string_ref.cc
index 05b9bd84416d083d7b9c178914550305fb922d95..539440d171586ea4f138f2e2417fe421299d8609 100644
--- a/modules/base/tests/test_string_ref.cc
+++ b/modules/base/tests/test_string_ref.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <ost/string_ref.hh>
 using namespace ost;
diff --git a/modules/base/tests/tests.cc b/modules/base/tests/tests.cc
index 9d9646b9f8ead978584f0a48da4af3c58a671fad..8bf9b0a2357bd946b17b31d2e554684ef2e4f4da 100644
--- a/modules/base/tests/tests.cc
+++ b/modules/base/tests/tests.cc
@@ -18,7 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_base
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/conop/tests/test_amino_acids.cc b/modules/conop/tests/test_amino_acids.cc
index 29266729c3c24d8e4c1857c1321f6c6a14c79870..58c842a57e7281e2111bf88495fc43f71b49799e 100644
--- a/modules/conop/tests/test_amino_acids.cc
+++ b/modules/conop/tests/test_amino_acids.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/conop/amino_acids.hh>
 
diff --git a/modules/conop/tests/test_heuristic_builder.cc b/modules/conop/tests/test_heuristic_builder.cc
index f2378e660eb4649fb0787af02e65ab5c21481839..cf6efa96f28187ded714133b97b87b955ca2b76f 100644
--- a/modules/conop/tests/test_heuristic_builder.cc
+++ b/modules/conop/tests/test_heuristic_builder.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/log.hh>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/conop/tests/test_heuristic_conop.cc b/modules/conop/tests/test_heuristic_conop.cc
index 61155c644b20c11220218355153a8b334e4817bf..65e0a7fc2d7e9f5de8754b8668eedb28db1e5b44 100644
--- a/modules/conop/tests/test_heuristic_conop.cc
+++ b/modules/conop/tests/test_heuristic_conop.cc
@@ -24,7 +24,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include "helper.hh"
 using boost::unit_test_framework::test_suite;
 using namespace ost;
diff --git a/modules/conop/tests/test_rule_based_conop.cc b/modules/conop/tests/test_rule_based_conop.cc
index 1ce4ebe2436ff5f3d148a6272d3cb7b73cefb481..485454611462364f4a77f75d0fff4f3dd3672daf 100644
--- a/modules/conop/tests/test_rule_based_conop.cc
+++ b/modules/conop/tests/test_rule_based_conop.cc
@@ -20,7 +20,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 #include <ost/platform.hh>
diff --git a/modules/conop/tests/tests.cc b/modules/conop/tests/tests.cc
index 7a6d17c40b6332d2185913263122eb86e91d3df6..21dd70140444ba26a29e3c3ce7a85b8d7faaa2b2 100644
--- a/modules/conop/tests/tests.cc
+++ b/modules/conop/tests/tests.cc
@@ -18,6 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_conop
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
diff --git a/modules/geom/tests/test_composite2.cc b/modules/geom/tests/test_composite2.cc
index 612d73b0a13b3ef27f6ad86b88e0ffbcc72c6b0f..a459f74d1123ff14855470eb41f49f573078301b 100644
--- a/modules/geom/tests/test_composite2.cc
+++ b/modules/geom/tests/test_composite2.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_composite3.cc b/modules/geom/tests/test_composite3.cc
index a9fb6ea4d6bf4038c91450ac4b74f6edec35b8b8..31479351cf63b5f946a7ac67d49007b1311168d5 100644
--- a/modules/geom/tests/test_composite3.cc
+++ b/modules/geom/tests/test_composite3.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include "helper.hh"
diff --git a/modules/geom/tests/test_mat2.cc b/modules/geom/tests/test_mat2.cc
index c0f2e429f130a93186f9114e7275b5be9bbd3f23..944de8e9a5276af0c1e33c0c414fc5032379eeb8 100644
--- a/modules/geom/tests/test_mat2.cc
+++ b/modules/geom/tests/test_mat2.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_mat3.cc b/modules/geom/tests/test_mat3.cc
index 7481e519e4bbf2d8b9c26943521fd73044a24bdd..2d4ce923eb4d276b2c3b6acece0e56dd5f286009 100644
--- a/modules/geom/tests/test_mat3.cc
+++ b/modules/geom/tests/test_mat3.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_mat4.cc b/modules/geom/tests/test_mat4.cc
index 64c0eff7a9efa0f9d2b06ca920f793ad9fa0e433..bee468108bc8c038caae0b2156dcd67d6f3a3b2d 100644
--- a/modules/geom/tests/test_mat4.cc
+++ b/modules/geom/tests/test_mat4.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_op2.cc b/modules/geom/tests/test_op2.cc
index fd52c6f3b32cb9d50ab370be1c99cf670e7dc78b..3805cc879bbf5caa0df7d1ab885b7add4f30e744 100644
--- a/modules/geom/tests/test_op2.cc
+++ b/modules/geom/tests/test_op2.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_op3.cc b/modules/geom/tests/test_op3.cc
index b37013a8c096bc5d2c90566f36ee9c26fa926377..519b19f8eb38cf3126d7a1ee083f769f7023b5b2 100644
--- a/modules/geom/tests/test_op3.cc
+++ b/modules/geom/tests/test_op3.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_op4.cc b/modules/geom/tests/test_op4.cc
index b9c4beeedfaa2e8e91693dbd86fbb17788a592d9..96edec9175189a3e4b30446b215ad3e65a43cc71 100644
--- a/modules/geom/tests/test_op4.cc
+++ b/modules/geom/tests/test_op4.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 
 #include "helper.hh"
diff --git a/modules/geom/tests/test_quat.cc b/modules/geom/tests/test_quat.cc
index 54b8cea33e8ae65206d96dfcf35af88e43f19082..b4228dc38476c3d6b200f8276abcee3c38022da3 100644
--- a/modules/geom/tests/test_quat.cc
+++ b/modules/geom/tests/test_quat.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include "helper.hh"
diff --git a/modules/geom/tests/test_transform.cc b/modules/geom/tests/test_transform.cc
index 8ac2ce97b579fe2e5c854c31b6a348e9e0a0910c..f52a47628f635d8c01a9889e77a0fbdbef8bde78 100644
--- a/modules/geom/tests/test_transform.cc
+++ b/modules/geom/tests/test_transform.cc
@@ -21,7 +21,6 @@
  */
  #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/geom/geom.hh>
 
 using namespace geom;
diff --git a/modules/geom/tests/test_vec2.cc b/modules/geom/tests/test_vec2.cc
index c7cb014de5378c0da4745ad327c260d48fe9c592..3ea6090b2c3d3ce4e4cf348d360ede46bfc75ce8 100644
--- a/modules/geom/tests/test_vec2.cc
+++ b/modules/geom/tests/test_vec2.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_vec3.cc b/modules/geom/tests/test_vec3.cc
index 9b2a4cc8bb9919c1cee60581a11312ed8e76da57..b7c03ff7f2a3ec7f5b43d55c7a498a00df9caad6 100644
--- a/modules/geom/tests/test_vec3.cc
+++ b/modules/geom/tests/test_vec3.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_vec4.cc b/modules/geom/tests/test_vec4.cc
index f39988a41eef50063a77810c0e8ff5b08f785915..44b87bcf19a9aee5018159ddd02b93cecaa98dbb 100644
--- a/modules/geom/tests/test_vec4.cc
+++ b/modules/geom/tests/test_vec4.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/tests.cc b/modules/geom/tests/tests.cc
index 87ec85ccf0cf850e2307d22223343055c59eb17f..c0b2b30306327a8892ab74e9bbc22923711f2c84 100644
--- a/modules/geom/tests/tests.cc
+++ b/modules/geom/tests/tests.cc
@@ -18,7 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE geom
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/io/tests/test_clustal.cc b/modules/io/tests/test_clustal.cc
index b9ebf221b655b00c6c1a50b23d74685cfd389169..c6cb21c58e51d927510d2b572d7753fcbd61a3a8 100644
--- a/modules/io/tests/test_clustal.cc
+++ b/modules/io/tests/test_clustal.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/io/seq/clustal_io_handler.hh>
 #include <ost/io/seq/load.hh>
diff --git a/modules/io/tests/test_exceptions.cc b/modules/io/tests/test_exceptions.cc
index 27d9ea661822b6d4879f6b47a1fc204194fa677f..1a2befe054a8a8f7214e4bb12016f247b3bb8377 100644
--- a/modules/io/tests/test_exceptions.cc
+++ b/modules/io/tests/test_exceptions.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/io/img/load_map.hh>
 #include <ost/img/image.hh>
diff --git a/modules/io/tests/test_io_crd.cc b/modules/io/tests/test_io_crd.cc
index 4cde64f327c6a0bcd9710d0468db5399edc7f250..f51d67af15a68defa531106acef59f72cdaf3e7d 100644
--- a/modules/io/tests/test_io_crd.cc
+++ b/modules/io/tests/test_io_crd.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/test_utils/compare_files.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/io/tests/test_io_dcd.cc b/modules/io/tests/test_io_dcd.cc
index fb95e6e83d3f161ebdbd1ae0e21f4a9e34a860ce..270d371e8034c6edea2a6e2a7ec37984e304b682 100644
--- a/modules/io/tests/test_io_dcd.cc
+++ b/modules/io/tests/test_io_dcd.cc
@@ -19,7 +19,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/io/mol/dcd_io.hh>
 #include <ost/mol/entity_handle.hh>
diff --git a/modules/io/tests/test_io_img.cc b/modules/io/tests/test_io_img.cc
index 9ac75d094c16fb64cddbc5ec231d41a4a5804832..2e7b4961c43e0679b82303e00d6b152dceacf560 100644
--- a/modules/io/tests/test_io_img.cc
+++ b/modules/io/tests/test_io_img.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <map>
 #include <ost/io/img/load_map.hh>
diff --git a/modules/io/tests/test_io_pdb.cc b/modules/io/tests/test_io_pdb.cc
index ffc6dd286154a33680f950b6c6c47667f9581601..4eb4cb19b2d7a56091cc5caf5e1714ab5913781f 100644
--- a/modules/io/tests/test_io_pdb.cc
+++ b/modules/io/tests/test_io_pdb.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 using boost::unit_test_framework::test_suite;
 
diff --git a/modules/io/tests/test_io_sdf.cc b/modules/io/tests/test_io_sdf.cc
index c90b80b30f4efc571412222d4b7ca7e36fdf4f2c..b15b4f6e7c4e34a8033a6577dbf714dc3b605b09 100644
--- a/modules/io/tests/test_io_sdf.cc
+++ b/modules/io/tests/test_io_sdf.cc
@@ -19,7 +19,6 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/io/tests/test_io_sequence_profile.cc b/modules/io/tests/test_io_sequence_profile.cc
index 05a02345e2536e50fd976ba941ed80e71126bce3..a99b93c9cc8dcf7c11c51ec8ab2d67149646d8f0 100644
--- a/modules/io/tests/test_io_sequence_profile.cc
+++ b/modules/io/tests/test_io_sequence_profile.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <iostream>
 
 #include <ost/seq/profile_handle.hh>
diff --git a/modules/io/tests/test_iomanager.cc b/modules/io/tests/test_iomanager.cc
index b6e79f1fc6cda5ffc73a4990e23def87d2c5c96d..7cc80671bb2eb6b4c824e08370b65008df47c869 100644
--- a/modules/io/tests/test_iomanager.cc
+++ b/modules/io/tests/test_iomanager.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 using boost::unit_test_framework::test_suite;
 #include <ost/io/io_manager.hh>
 
diff --git a/modules/io/tests/test_mmcif_info.cc b/modules/io/tests/test_mmcif_info.cc
index 6707ff930cf29eded775b6f85d3ad57c0dc19cb4..28c165c80a22a9bed3f5db610e872b51387c1ad9 100644
--- a/modules/io/tests/test_mmcif_info.cc
+++ b/modules/io/tests/test_mmcif_info.cc
@@ -19,7 +19,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <ost/io/io_exception.hh>
diff --git a/modules/io/tests/test_mmcif_reader.cc b/modules/io/tests/test_mmcif_reader.cc
index df82b4ec85df1c455da8a5aa09652ac58a4b77b3..87e844f72e8a247796d9ffec69535c722ee8a481 100644
--- a/modules/io/tests/test_mmcif_reader.cc
+++ b/modules/io/tests/test_mmcif_reader.cc
@@ -19,7 +19,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <fstream>
diff --git a/modules/io/tests/test_pir.cc b/modules/io/tests/test_pir.cc
index 946d113bab6f8781be733582e45bfe15f65dc7f7..7c4c67d97148436d7174cffbef97339220e254b2 100644
--- a/modules/io/tests/test_pir.cc
+++ b/modules/io/tests/test_pir.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/seq/invalid_sequence.hh>
 #include <ost/io/seq/pir_io_handler.hh>
 #include <ost/io/seq/load.hh>
diff --git a/modules/io/tests/test_star_parser.cc b/modules/io/tests/test_star_parser.cc
index c4e40fdbda137d74293282a592884fb5aa7e8305..8024025a5154b94ddb731400f8a6b2ad0ed68bea 100644
--- a/modules/io/tests/test_star_parser.cc
+++ b/modules/io/tests/test_star_parser.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <fstream>
diff --git a/modules/io/tests/tests.cc b/modules/io/tests/tests.cc
index 85c0f12e22ce3afe219d727fcd687ee35d33a7a6..faa6774fc478a3bf696a7105461792447f9fff7a 100644
--- a/modules/io/tests/tests.cc
+++ b/modules/io/tests/tests.cc
@@ -18,6 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_io
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
diff --git a/modules/mol/alg/tests/test_consistency_checks.cc b/modules/mol/alg/tests/test_consistency_checks.cc
index b7e3d3e4cc4742fb7df7bf28ec87287396b93a4a..927b9d1efacbc4d5a56a411c7ab421cec327f1bb 100644
--- a/modules/mol/alg/tests/test_consistency_checks.cc
+++ b/modules/mol/alg/tests/test_consistency_checks.cc
@@ -22,7 +22,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 #include <ost/mol/alg/consistency_checks.hh>
diff --git a/modules/mol/alg/tests/test_partial_sec_struct_assignment.cc b/modules/mol/alg/tests/test_partial_sec_struct_assignment.cc
index b6a9915608edd7858af045686a93e8df8b740369..56d247515b06a0dc3e54692641f1aaa8fcc7c469 100644
--- a/modules/mol/alg/tests/test_partial_sec_struct_assignment.cc
+++ b/modules/mol/alg/tests/test_partial_sec_struct_assignment.cc
@@ -21,7 +21,6 @@
 #include <ost/mol/alg/sec_struct.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/io/mol/pdb_reader.hh>
 #include <ost/mol/builder.hh>
diff --git a/modules/mol/alg/tests/test_superposition.cc b/modules/mol/alg/tests/test_superposition.cc
index e3c88d647141532e5b782e50011971a0aca73b62..ba35aa122831036ab00fadeca2beb469750d5ca5 100644
--- a/modules/mol/alg/tests/test_superposition.cc
+++ b/modules/mol/alg/tests/test_superposition.cc
@@ -23,7 +23,6 @@
 #include <ost/mol/alg/svd_superpose.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/mol/builder.hh>
 #include <ost/message.hh>
diff --git a/modules/mol/alg/tests/tests.cc b/modules/mol/alg/tests/tests.cc
index fb9a32714d45fb72999e591145120f97a809923d..4308786c168fa90c76c2b7e0417e86407509efe8 100644
--- a/modules/mol/alg/tests/tests.cc
+++ b/modules/mol/alg/tests/tests.cc
@@ -22,6 +22,4 @@
  */
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_mol_alg
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
diff --git a/modules/mol/base/tests/test_atom_groups.cc b/modules/mol/base/tests/test_atom_groups.cc
index 7514f57acfd0242a20ecfb64aba55cb6f9b79e3f..71898da71126d8d9324c01975d2e1deb89421a7a 100644
--- a/modules/mol/base/tests/test_atom_groups.cc
+++ b/modules/mol/base/tests/test_atom_groups.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/message.hh>
 #include "dummy_ent.hh"
diff --git a/modules/mol/base/tests/test_builder.cc b/modules/mol/base/tests/test_builder.cc
index f9128bca409ca2df578c9829eb1acb2fea99615a..30e8bdcdd8137a8f95e5f2123de5b7fd2c87fb2f 100644
--- a/modules/mol/base/tests/test_builder.cc
+++ b/modules/mol/base/tests/test_builder.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 using namespace ost;
 using namespace ost::mol;
diff --git a/modules/mol/base/tests/test_chain.cc b/modules/mol/base/tests/test_chain.cc
index 8f60804014d25459af7671965556b1e48e45bf9e..c1442dd457995e06ed4ca6cb77e7b2fe023b85e7 100644
--- a/modules/mol/base/tests/test_chain.cc
+++ b/modules/mol/base/tests/test_chain.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 #include <ost/message.hh>
diff --git a/modules/mol/base/tests/test_conn.cc b/modules/mol/base/tests/test_conn.cc
index be08f357a89b718027fbd4039d8719489b8cbbb5..14068218212c762993970b7cdc18d672113f3377 100644
--- a/modules/mol/base/tests/test_conn.cc
+++ b/modules/mol/base/tests/test_conn.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 
 using namespace ost;
diff --git a/modules/mol/base/tests/test_coord_group.cc b/modules/mol/base/tests/test_coord_group.cc
index a26f2e2bd7dcfb296a62922792408e4b4c2c4b97..39be2c38ce1563be161fa34cc1f0559767a4d09c 100644
--- a/modules/mol/base/tests/test_coord_group.cc
+++ b/modules/mol/base/tests/test_coord_group.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 #include <ost/mol/coord_group.hh>
diff --git a/modules/mol/base/tests/test_delete.cc b/modules/mol/base/tests/test_delete.cc
index 2d5f2339ce7f6d0072d654840d3fed814e7301b1..4f7b8dbb204670d1601372411801cabd586c29e8 100644
--- a/modules/mol/base/tests/test_delete.cc
+++ b/modules/mol/base/tests/test_delete.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/log.hh>
 #include <ost/message.hh>
diff --git a/modules/mol/base/tests/test_entity.cc b/modules/mol/base/tests/test_entity.cc
index cab0efe6948fada6faeeeaa85f99ba57d1715856..7d8ea348573d6037a699ab2f44dde05dbf6e5b58 100644
--- a/modules/mol/base/tests/test_entity.cc
+++ b/modules/mol/base/tests/test_entity.cc
@@ -22,7 +22,6 @@
  
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/geom/vec_mat_predicates.hh>
 #include <ost/mol/chem_class.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/mol/base/tests/test_ics.cc b/modules/mol/base/tests/test_ics.cc
index 231df43cd79d7d4b8217a83eaa91f24b8213ed76..a68d49734e5fee7c75189727bcece0fa4590650d 100644
--- a/modules/mol/base/tests/test_ics.cc
+++ b/modules/mol/base/tests/test_ics.cc
@@ -22,7 +22,6 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/log.hh>
 #include <ost/message.hh>
diff --git a/modules/mol/base/tests/test_iterators.cc b/modules/mol/base/tests/test_iterators.cc
index 47b24bb11f6f002dded9b8e3a15fbb2899d82898..cfd61c5099faf4dca8ea02c754d1b0c68e4065d2 100644
--- a/modules/mol/base/tests/test_iterators.cc
+++ b/modules/mol/base/tests/test_iterators.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/message.hh>
 #include <iostream>
diff --git a/modules/mol/base/tests/test_query.cc b/modules/mol/base/tests/test_query.cc
index 5f8865ae5b71d48e0247615b106ce34525f192bf..185b0f16812ef4bc9470d593876243bf6ecc5f05 100644
--- a/modules/mol/base/tests/test_query.cc
+++ b/modules/mol/base/tests/test_query.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/query.hh>
 #include <ost/mol/mol.hh>
 #include <ost/mol/entity_view.hh>
diff --git a/modules/mol/base/tests/test_residue.cc b/modules/mol/base/tests/test_residue.cc
index d828544b7eba1ef47d5c995b4341b438e68e8c9d..a06c6a6cf82630a304d1522ae7485b9cd9eae360 100644
--- a/modules/mol/base/tests/test_residue.cc
+++ b/modules/mol/base/tests/test_residue.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 
 #include <ost/message.hh>
diff --git a/modules/mol/base/tests/test_surface.cc b/modules/mol/base/tests/test_surface.cc
index d48b79843a88f80ce5f69cdf957c5c05fd3a3492..ecc8d40b1c56c9c0f2f31b84a1f19a25af0a5fee 100644
--- a/modules/mol/base/tests/test_surface.cc
+++ b/modules/mol/base/tests/test_surface.cc
@@ -19,7 +19,6 @@
  
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/surface_handle.hh>
 #include <cmath>
diff --git a/modules/mol/base/tests/test_transfer_connectivity.cc b/modules/mol/base/tests/test_transfer_connectivity.cc
index 2f5dff1439bf64099a9e109d6336ac6dc54b8737..1bb37feed3c729dc2a8ab9f65b350f55770d2324 100644
--- a/modules/mol/base/tests/test_transfer_connectivity.cc
+++ b/modules/mol/base/tests/test_transfer_connectivity.cc
@@ -25,7 +25,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 using namespace ost;
 using namespace ost::mol;
diff --git a/modules/mol/base/tests/test_view.cc b/modules/mol/base/tests/test_view.cc
index 9a72c9d16dcf879f2fa4fe2bb569e4156aa847c9..2aee173d32a45769f696fa448bf486ba812e7edd 100644
--- a/modules/mol/base/tests/test_view.cc
+++ b/modules/mol/base/tests/test_view.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 
 
diff --git a/modules/mol/base/tests/test_view_op.cc b/modules/mol/base/tests/test_view_op.cc
index abe84f3baa65d356bcc2989245084c605f21f672..f61f5d5bc6502a37279fd1e2e2f4f622d6db64bb 100644
--- a/modules/mol/base/tests/test_view_op.cc
+++ b/modules/mol/base/tests/test_view_op.cc
@@ -21,7 +21,6 @@
  */
  #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/mol/view_op.hh>
 
diff --git a/modules/mol/base/tests/tests.cc b/modules/mol/base/tests/tests.cc
index 8fb5bbd47707615b1702765ff363cf8525716942..117985fd0151606c9216e483616d93d180396b01 100644
--- a/modules/mol/base/tests/tests.cc
+++ b/modules/mol/base/tests/tests.cc
@@ -18,7 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_mol_base
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/mol/mm/tests/test_block.cc b/modules/mol/mm/tests/test_block.cc
index 20aaf2a7328779ae52cf2c6e7b0626b3f94e78e7..93826f8256a738256f22fe8192f0728f5bbbd983 100644
--- a/modules/mol/mm/tests/test_block.cc
+++ b/modules/mol/mm/tests/test_block.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/interaction.hh>
 #include <ost/mol/mm/buildingblock.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/mol/mm/tests/test_block_modifiers.cc b/modules/mol/mm/tests/test_block_modifiers.cc
index 0c60dd268b4f06b02204c6eae8c075d650701685..46b9c03c645cd7824187148ea871c593d36bfc7f 100644
--- a/modules/mol/mm/tests/test_block_modifiers.cc
+++ b/modules/mol/mm/tests/test_block_modifiers.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/interaction.hh>
 #include <ost/mol/mm/buildingblock.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/mol/mm/tests/test_forcefield.cc b/modules/mol/mm/tests/test_forcefield.cc
index cda6b18df4a8c38e315aef5e3849642e083d0c18..45b658a1df29b4f81bffb788323ce2c17a5ccd9c 100644
--- a/modules/mol/mm/tests/test_forcefield.cc
+++ b/modules/mol/mm/tests/test_forcefield.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/settings.hh>
 #include <ost/mol/mm/forcefield.hh>
 #include <ost/mol/mm/interaction.hh>
diff --git a/modules/mol/mm/tests/test_interaction.cc b/modules/mol/mm/tests/test_interaction.cc
index d021c5e711cfdc8b876b1d3a42a52310d8eb0db0..5c198079039c4bece741c5c45026c3703866d77c 100644
--- a/modules/mol/mm/tests/test_interaction.cc
+++ b/modules/mol/mm/tests/test_interaction.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/interaction.hh>
 #include <ost/mol/mol.hh>
 #include <ost/mol/builder.hh>
diff --git a/modules/mol/mm/tests/test_simulation.cc b/modules/mol/mm/tests/test_simulation.cc
index cfe2b608136a315fd89aa72bf0685f2bcfc8c3ee..4836f2f2a76f878ec4502d3bc6cebd3a2ffef103 100644
--- a/modules/mol/mm/tests/test_simulation.cc
+++ b/modules/mol/mm/tests/test_simulation.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/settings.hh>
 #include <ost/mol/mm/forcefield.hh>
 #include <ost/mol/mm/interaction.hh>
diff --git a/modules/mol/mm/tests/test_topology.cc b/modules/mol/mm/tests/test_topology.cc
index 5d8644fa25cd5b90f79a3c29acc3445e9ad0deb3..e74b79a4b194febe06c24519ed5d61bc77c562a8 100644
--- a/modules/mol/mm/tests/test_topology.cc
+++ b/modules/mol/mm/tests/test_topology.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/topology.hh>
 #include <ost/mol/mm/topology_creator.hh>
 #include <ost/mol/mm/settings.hh>
diff --git a/modules/mol/mm/tests/tests.cc b/modules/mol/mm/tests/tests.cc
index 6a7e493fad5d292938130abacbe3c60511b5729e..973da7b137ef0990ea16d0b634201b24bf44a4ab 100644
--- a/modules/mol/mm/tests/tests.cc
+++ b/modules/mol/mm/tests/tests.cc
@@ -19,7 +19,4 @@
 
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_mol_base
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/seq/alg/tests/test_distance_analysis.cc b/modules/seq/alg/tests/test_distance_analysis.cc
index e8b41e819329c2c6adcf60e6f241154bc740f186..928c00ead3741f43be5f763823f15b1e235a0273 100644
--- a/modules/seq/alg/tests/test_distance_analysis.cc
+++ b/modules/seq/alg/tests/test_distance_analysis.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/atom_view.hh>
 #include <ost/mol/xcs_editor.hh>
diff --git a/modules/seq/alg/tests/test_merge_pairwise_alignments.cc b/modules/seq/alg/tests/test_merge_pairwise_alignments.cc
index 5c23b1f65873aefba0cb99c9dbf1a6ca2cc89708..bcdca910fd34a4a01a35a41397b8b6c2ae09a9e5 100644
--- a/modules/seq/alg/tests/test_merge_pairwise_alignments.cc
+++ b/modules/seq/alg/tests/test_merge_pairwise_alignments.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/seq/alg/merge_pairwise_alignments.hh>
 #include <ost/integrity_error.hh>
diff --git a/modules/seq/alg/tests/test_sequence_identity.cc b/modules/seq/alg/tests/test_sequence_identity.cc
index 7173ff8c2920ce4665fbe379a8e35c204bca79b2..d95d5a671b3a8d2f905230d8988f0acf1db08987 100644
--- a/modules/seq/alg/tests/test_sequence_identity.cc
+++ b/modules/seq/alg/tests/test_sequence_identity.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <ost/seq/alg/sequence_identity.hh>
 
diff --git a/modules/seq/alg/tests/tests.cc b/modules/seq/alg/tests/tests.cc
index 6203808c24decbbfc2ebe5aee2ce74cdf78ad659..5a9ec9d000e545ebf3036f5c08a5e01b1f73ef89 100644
--- a/modules/seq/alg/tests/tests.cc
+++ b/modules/seq/alg/tests/tests.cc
@@ -18,7 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_seq_alg
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/seq/base/tests/test_aligned_column.cc b/modules/seq/base/tests/test_aligned_column.cc
index d934cefb0d930ed167367d583ced4e9dcf6f4b3c..73e75310ca7d71f111a19e4eb8b35adc3107563b 100644
--- a/modules/seq/base/tests/test_aligned_column.cc
+++ b/modules/seq/base/tests/test_aligned_column.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 
diff --git a/modules/seq/base/tests/test_aligned_region.cc b/modules/seq/base/tests/test_aligned_region.cc
index 118c8d09fd843b94c4cec8551d50ac968892e961..27ddc299b5b9939a94cab31b9a292d07b213983c 100644
--- a/modules/seq/base/tests/test_aligned_region.cc
+++ b/modules/seq/base/tests/test_aligned_region.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 
diff --git a/modules/seq/base/tests/test_alignment.cc b/modules/seq/base/tests/test_alignment.cc
index 52da21684c6dfc2f68e6788b36fce28bad85e65e..05a405b37378fec6af5a7a932bf0752a2eace60a 100644
--- a/modules/seq/base/tests/test_alignment.cc
+++ b/modules/seq/base/tests/test_alignment.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/invalid_handle.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/seq/base/tests/test_profile.cc b/modules/seq/base/tests/test_profile.cc
index c48e65f36258baebbf1d1b829ce07f3e1fb7c741..252add767447ae29a6f97585bf5227de787fa749 100644
--- a/modules/seq/base/tests/test_profile.cc
+++ b/modules/seq/base/tests/test_profile.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <iostream>
 
 #include <ost/seq/profile_handle.hh>
diff --git a/modules/seq/base/tests/test_sequence.cc b/modules/seq/base/tests/test_sequence.cc
index 309939db0d715aa4b8dce5256bac8176117bc07a..b18855bdd95c38e5d87fe5cfb37fd60e29914a47 100644
--- a/modules/seq/base/tests/test_sequence.cc
+++ b/modules/seq/base/tests/test_sequence.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 
diff --git a/modules/seq/base/tests/tests.cc b/modules/seq/base/tests/tests.cc
index 8d2205011a3c18953a65922d8a8e851ef6f6fd52..4d3b8b161269ae40f50241b4d1643f03117d9ddd 100644
--- a/modules/seq/base/tests/tests.cc
+++ b/modules/seq/base/tests/tests.cc
@@ -18,6 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_seq_base
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>