diff -Naurp boost_1_34_1-orig/libs/concept_check/Jamfile.v2 boost_1_34_1/libs/concept_check/Jamfile.v2
--- boost_1_34_1-orig/libs/concept_check/Jamfile.v2	2006-11-28 11:28:34.000000000 -0600
+++ boost_1_34_1/libs/concept_check/Jamfile.v2	2009-03-21 18:14:52.000000000 -0600
@@ -5,8 +5,8 @@
 import testing ;
 
 test-suite concept_check
-  : [ run stl_concept_covering.cpp ]
-    [ run concept_check_test.cpp  ]
+  : [ compile-fail stl_concept_covering.cpp ]
+    [ compile-fail concept_check_test.cpp  ]
     [ run class_concept_check_test.cpp ]
     [ compile-fail concept_check_fail_expected.cpp ]
     [ compile-fail class_concept_fail_expected.cpp ]
diff -Naurp boost_1_34_1-orig/libs/program_options/test/test_convert.cpp boost_1_34_1/libs/program_options/test/test_convert.cpp
--- boost_1_34_1-orig/libs/program_options/test/test_convert.cpp	2006-02-28 16:56:33.000000000 -0600
+++ boost_1_34_1/libs/program_options/test/test_convert.cpp	2009-03-21 18:09:20.000000000 -0600
@@ -13,6 +13,7 @@
 
 #include <boost/program_options/detail/convert.hpp>
 #include <boost/program_options/detail/utf8_codecvt_facet.hpp>
+#include <boost/test/test_tools.hpp>
 
 using namespace std;
 
@@ -74,7 +75,7 @@ std::wstring from_8_bit_2(const std::str
 void test_convert(const std::string& input, 
                   const std::string& expected_output)
 {
-    boost::program_options::detail::utf8_codecvt_facet<wchar_t, char> facet;
+    boost::program_options::detail::utf8_codecvt_facet facet;
     
     std::wstring output;
     { 
diff -Naurp boost_1_34_1-orig/libs/spirit/test/symbols_add_null.cpp boost_1_34_1/libs/spirit/test/symbols_add_null.cpp
--- boost_1_34_1-orig/libs/spirit/test/symbols_add_null.cpp	2006-02-28 16:56:32.000000000 -0600
+++ boost_1_34_1/libs/spirit/test/symbols_add_null.cpp	2009-03-21 18:10:46.000000000 -0600
@@ -9,6 +9,10 @@
 
 #define BOOST_SPIRIT_ASSERT_EXCEPTION ::spirit_exception
 
+#ifdef NDEBUG
+#  undef NDEBUG
+#endif
+
 struct spirit_exception
 {
     spirit_exception(char const * msg)
diff -Naurp boost_1_34_1-orig/libs/test/test/prg_exec_fail3.cpp boost_1_34_1/libs/test/test/prg_exec_fail3.cpp
--- boost_1_34_1-orig/libs/test/test/prg_exec_fail3.cpp	2006-03-19 05:49:04.000000000 -0600
+++ boost_1_34_1/libs/test/test/prg_exec_fail3.cpp	2009-03-21 18:13:09.000000000 -0600
@@ -15,6 +15,10 @@
 
 #include <cassert>
 
+#ifdef NDEBUG
+#  undef NDEBUG
+#endif
+
 int cpp_main( int, char *[] )  // note the name
 {
   int div = 0;