diff --git a/test/Jamfile b/test/Jamfile
index fe596d3..c38fef1 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -18,7 +18,7 @@ compile at.cpp ;
 compile back.cpp ;
 compile bind.cpp ;
 compile bitwise.cpp ;
-compile bool.cpp ;
+run bool.cpp ;
 compile comparison.cpp ;
 compile contains.cpp ;
 compile copy.cpp ;
@@ -36,7 +36,7 @@ compile filter_view.cpp ;
 compile find.cpp ;
 compile find_if.cpp ;
 compile fold.cpp ;
-unit-test for_each : for_each.cpp : <sysinclude>$(BOOST_ROOT) ;
+run for_each.cpp ;
 compile front.cpp ;
 compile has_xxx.cpp ;
 compile identity.cpp ;
@@ -45,8 +45,8 @@ compile index_of.cpp ;
 compile inherit.cpp ;
 compile insert.cpp ;
 compile insert_range.cpp ;
-compile int.cpp ;
-compile integral_c.cpp ;
+run int.cpp ;
+run integral_c.cpp ;
 compile is_placeholder.cpp ;
 compile is_sequence.cpp ;
 compile iterator_tags.cpp ;
@@ -80,7 +80,7 @@ compile set.cpp ;
 compile set_c.cpp ;
 compile single_view.cpp ;
 compile size.cpp ;
-compile size_t.cpp ;
+run size_t.cpp ;
 compile sizeof.cpp ;
 compile sort.cpp ;
 compile stable_partition.cpp ;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index ea83443..efec642 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -14,7 +14,7 @@ compile at.cpp ;
 compile back.cpp ;
 compile bind.cpp ;
 compile bitwise.cpp ;
-compile bool.cpp ;
+run bool.cpp ;
 compile comparison.cpp ;
 compile contains.cpp ;
 compile copy.cpp ;
@@ -41,8 +41,8 @@ compile index_of.cpp ;
 compile inherit.cpp ;
 compile insert.cpp ;
 compile insert_range.cpp ;
-compile int.cpp ;
-compile integral_c.cpp ;
+run int.cpp ;
+run integral_c.cpp ;
 compile is_placeholder.cpp ;
 compile is_sequence.cpp ;
 compile iterator_tags.cpp ;
@@ -76,7 +76,7 @@ compile set.cpp ;
 compile set_c.cpp ;
 compile single_view.cpp ;
 compile size.cpp ;
-compile size_t.cpp ;
+run size_t.cpp ;
 compile sizeof.cpp ;
 compile sort.cpp ;
 compile stable_partition.cpp ;
diff --git a/test/bool.cpp b/test/bool.cpp
index 333a823..2236087 100644
--- a/test/bool.cpp
+++ b/test/bool.cpp
@@ -21,7 +21,7 @@
     { MPL_ASSERT(( is_same< bool_<c>, c##_ > )); } \
     { MPL_ASSERT(( is_same< bool_<c>::type, bool_<c> > )); } \
     { MPL_ASSERT_RELATION( bool_<c>::value, ==, c ); } \
-    assert( bool_<c>() == c ); \
+    BOOST_TEST( bool_<c>() == c ); \
 /**/
 
 MPL_TEST_CASE()
diff --git a/test/integral_wrapper_test.hpp b/test/integral_wrapper_test.hpp
index ca4fbc7..4ef47c9 100644
--- a/test/integral_wrapper_test.hpp
+++ b/test/integral_wrapper_test.hpp
@@ -19,12 +19,12 @@
 
 #if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
 #   define INTEGRAL_WRAPPER_RUNTIME_TEST(i, T) \
-    assert(( WRAPPER(T,i)() == i )); \
-    assert(( WRAPPER(T,i)::value == i )); \
+    BOOST_TEST(( WRAPPER(T,i)() == i )); \
+    BOOST_TEST(( WRAPPER(T,i)::value == i )); \
     /**/
 #else
 #   define INTEGRAL_WRAPPER_RUNTIME_TEST(i, T) \
-    assert(( WRAPPER(T,i)::value == i )); \
+    BOOST_TEST(( WRAPPER(T,i)::value == i )); \
     /**/
 #endif
 
diff --git a/test/set.cpp b/test/set.cpp
index 644bd2e..a6f2193 100644
--- a/test/set.cpp
+++ b/test/set.cpp
@@ -68,9 +68,9 @@ MPL_TEST_CASE()
     typedef begin<s2>::type first2;
     typedef end<s2>::type last2;
 
-    MPL_ASSERT(( is_same< first2::type, int > ));
+    MPL_ASSERT(( is_same< deref<first2>::type, int > ));
     typedef next<first2>::type iter;
-    MPL_ASSERT(( is_same< iter::type, char > ));
+    MPL_ASSERT(( is_same< deref<iter>::type, char > ));
     MPL_ASSERT(( is_same< next<iter>::type, last2 > ));
 
     typedef insert<s2,int>::type s2_1;
@@ -166,15 +166,15 @@ MPL_TEST_CASE()
 
 // Use a template for testing so that GCC will show us the actual types involved
 template <class S>
-struct test
+void test()
 {
     MPL_ASSERT_RELATION( size<S>::value, ==, 3 );
 
     typedef typename end<S>::type not_found;
-    BOOST_MPL_ASSERT_NOT(( is_same<typename find<S,int>::type,not_found> ));
-    BOOST_MPL_ASSERT_NOT(( is_same<typename find<S,long>::type,not_found> ));
-    BOOST_MPL_ASSERT_NOT(( is_same<typename find<S,char>::type,not_found> ));
-    BOOST_MPL_ASSERT(( is_same<typename find<S,char*>::type,not_found> ));
+    BOOST_MPL_ASSERT_NOT(( is_same<BOOST_DEDUCED_TYPENAME find<S,int>::type,not_found> ));
+    BOOST_MPL_ASSERT_NOT(( is_same<BOOST_DEDUCED_TYPENAME find<S,long>::type,not_found> ));
+    BOOST_MPL_ASSERT_NOT(( is_same<BOOST_DEDUCED_TYPENAME find<S,char>::type,not_found> ));
+    BOOST_MPL_ASSERT(( is_same<BOOST_DEDUCED_TYPENAME find<S,char*>::type,not_found> ));
 };
 
 MPL_TEST_CASE()
@@ -185,6 +185,6 @@ MPL_TEST_CASE()
     
     typedef mpl::set<int,long,char> myset;
     
-    test<myset> x;
-    test<myset::type> y;
+    test<myset>();
+    test<myset::type>();
 }