diff --git a/test/aligned_storage_test.cpp b/test/aligned_storage_test.cpp
index f4b1abb..496ae2c 100644
--- a/test/aligned_storage_test.cpp
+++ b/test/aligned_storage_test.cpp
@@ -39,7 +39,7 @@ void do_check(const T&)
    must_be_pod<t1> pod1;
    no_unused_warning(as1);
    no_unused_warning(pod1);
-   BOOST_MESSAGE(typeid(t1).name());
+   BOOST_TEST_MESSAGE(typeid(t1).name());
    BOOST_CHECK(::tt::alignment_of<t1>::value == T::value);
    BOOST_CHECK(sizeof(t1) == T::value);
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
@@ -50,7 +50,7 @@ void do_check(const T&)
    must_be_pod<t2> pod2;
    no_unused_warning(as2);
    no_unused_warning(pod2);
-   BOOST_MESSAGE(typeid(t2).name());
+   BOOST_TEST_MESSAGE(typeid(t2).name());
    BOOST_CHECK(::tt::alignment_of<t2>::value == T::value);
    BOOST_CHECK(sizeof(t2) == T::value*2);
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
@@ -64,7 +64,7 @@ void do_check(const T&)
    must_be_pod<t3> pod3;
    no_unused_warning(as3);
    no_unused_warning(pod3);
-   BOOST_MESSAGE(typeid(t3).name());
+   BOOST_TEST_MESSAGE(typeid(t3).name());
    BOOST_CHECK(::tt::alignment_of<t3>::value == ::tt::alignment_of< ::boost::detail::max_align>::value);
    BOOST_CHECK((sizeof(t3) % T::value) == 0);
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
diff --git a/test/aligned_storage_test_a2.cpp b/test/aligned_storage_test_a2.cpp
index 73a9e4c..fa7360d 100644
--- a/test/aligned_storage_test_a2.cpp
+++ b/test/aligned_storage_test_a2.cpp
@@ -39,7 +39,7 @@ void do_check(const T&)
    must_be_pod<t1> pod1;
    no_unused_warning(as1);
    no_unused_warning(pod1);
-   BOOST_MESSAGE(typeid(t1).name());
+   BOOST_TEST_MESSAGE(typeid(t1).name());
    BOOST_CHECK(::tt::alignment_of<t1>::value == T::value);
    BOOST_CHECK(sizeof(t1) == T::value);
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
@@ -50,7 +50,7 @@ void do_check(const T&)
    must_be_pod<t2> pod2;
    no_unused_warning(as2);
    no_unused_warning(pod2);
-   BOOST_MESSAGE(typeid(t2).name());
+   BOOST_TEST_MESSAGE(typeid(t2).name());
    BOOST_CHECK(::tt::alignment_of<t2>::value == T::value);
    BOOST_CHECK(sizeof(t2) == T::value*2);
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
@@ -64,7 +64,7 @@ void do_check(const T&)
    must_be_pod<t3> pod3;
    no_unused_warning(as3);
    no_unused_warning(pod3);
-   BOOST_MESSAGE(typeid(t3).name());
+   BOOST_TEST_MESSAGE(typeid(t3).name());
    BOOST_CHECK(::tt::alignment_of<t3>::value == ::tt::alignment_of< ::boost::detail::max_align>::value);
    BOOST_CHECK((sizeof(t3) % T::value) == 0);
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
diff --git a/test/init.cpp b/test/init.cpp
index 113ab0c..95a5a9f 100644
--- a/test/init.cpp
+++ b/test/init.cpp
@@ -6,15 +6,15 @@
 
 #include "test.hpp"
 
-boost::unit_test_framework::test_suite* get_master_unit(const char* name)
+boost::unit_test::test_suite* get_master_unit(const char* name)
 {
-   static boost::unit_test_framework::test_suite* ptest_suite = 0;
+   static boost::unit_test::test_suite* ptest_suite = 0;
    if(0 == ptest_suite)
       ptest_suite = BOOST_TEST_SUITE( name ? name : "" );
    return ptest_suite;
 }
 
-boost::unit_test_framework::test_suite* init_unit_test_suite ( int , char* [] )
+boost::unit_test::test_suite* init_unit_test_suite ( int , char* [] )
 {
    return get_master_unit();
 }
diff --git a/test/test.hpp b/test/test.hpp
index 8bd6b90..00a1e60 100644
--- a/test/test.hpp
+++ b/test/test.hpp
@@ -67,7 +67,7 @@
 // global unit, this is not safe, but until the unit test framework uses
 // shared_ptr throughout this is about as good as it gets :-(
 //
-boost::unit_test_framework::test_suite* get_master_unit(const char* name = 0);
+boost::unit_test::test_suite* get_master_unit(const char* name = 0);
 
 //
 // initialisation class:
@@ -113,7 +113,7 @@ int error_count = 0;
    }\
    }while(0)
 
-#define BOOST_MESSAGE(message)\
+#define BOOST_TEST_MESSAGE(message)\
    do{ std::cout << __FILE__ << ":" << __LINE__ << ": " << message << std::endl; }while(0)
 
 #define BOOST_CHECK(pred)\