diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index e5e87cd..8df3f07 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -68,26 +68,31 @@ run visit_each_test.cpp ;
 
 run get_pointer_test.cpp ;
 
-run lightweight_test_test.cpp ;
-run lightweight_test_test.cpp : : : <exception-handling>off : lightweight_test_test_no_except ;
-run lightweight_test_test2.cpp ;
-run lightweight_test_all_with_test.cpp ;
-run lightweight_test_lt_le_test.cpp ;
-run lightweight_test_gt_ge_test.cpp ;
-run lightweight_test_eq_nullptr.cpp ;
-run lightweight_test_test3.cpp ;
-run lightweight_test_test4.cpp
-  : : :
-    <warnings>pedantic
+local pedantic-errors = <warnings>pedantic
     <toolset>msvc:<warnings-as-errors>on
     <toolset>gcc:<warnings-as-errors>on
     <toolset>clang:<warnings-as-errors>on ;
+
+run lightweight_test_test.cpp
+  : : : $(pedantic-errors) ;
+run lightweight_test_test.cpp : : :
+  <exception-handling>off $(pedantic-errors) : lightweight_test_test_no_except ;
+run lightweight_test_test2.cpp
+  : : : $(pedantic-errors) ;
+run lightweight_test_all_with_test.cpp
+  : : : $(pedantic-errors) ;
+run lightweight_test_lt_le_test.cpp
+  : : : $(pedantic-errors) ;
+run lightweight_test_gt_ge_test.cpp
+  : : : $(pedantic-errors) ;
+run lightweight_test_eq_nullptr.cpp
+  : : : $(pedantic-errors) ;
+run lightweight_test_test3.cpp
+  : : : $(pedantic-errors) ;
+run lightweight_test_test4.cpp
+  : : : $(pedantic-errors) ;
 run lightweight_test_test5.cpp
-  : : :
-    <warnings>pedantic
-    <toolset>msvc:<warnings-as-errors>on
-    <toolset>gcc:<warnings-as-errors>on
-    <toolset>clang:<warnings-as-errors>on
+  : : : $(pedantic-errors)
     <toolset>gcc-4.4.7:<cxxflags>-Wno-sign-compare ;
 
 run-fail lightweight_test_all_eq_test.cpp ;
@@ -112,7 +117,8 @@ run-fail lightweight_test_le_fail.cpp ;
 run-fail lightweight_test_gt_fail.cpp ;
 run-fail lightweight_test_ge_fail.cpp ;
 
-run lightweight_test_bool.cpp ;
+run lightweight_test_bool.cpp
+  : : : $(pedantic-errors) ;
 
 run is_same_test.cpp ;
 
diff --git a/test/lightweight_test_eq_nullptr.cpp b/test/lightweight_test_eq_nullptr.cpp
index fb24a5e..b502f93 100644
--- a/test/lightweight_test_eq_nullptr.cpp
+++ b/test/lightweight_test_eq_nullptr.cpp
@@ -8,8 +8,12 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/config.hpp>
+#if defined(_MSC_VER)
+# pragma warning( disable: 4100 ) // nullptr_t parameter unrereferenced
+#endif
+
 #include <boost/core/lightweight_test.hpp>
+#include <boost/config.hpp>
 
 int main()
 {
diff --git a/test/lightweight_test_test.cpp b/test/lightweight_test_test.cpp
index 47821c1..2880625 100644
--- a/test/lightweight_test_test.cpp
+++ b/test/lightweight_test_test.cpp
@@ -8,8 +8,14 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <vector>
+#if defined(_MSC_VER)
+# pragma warning( disable: 4702 ) // unreachable code
+# pragma warning( disable: 4530 ) // unwind without /EHsc from <ostream>
+# pragma warning( disable: 4577 ) // noexcept without /EHsc from <exception>
+#endif
+
 #include <boost/core/lightweight_test.hpp>
+#include <vector>
 
 struct X
 {
@@ -33,6 +39,12 @@ void f( bool x )
     }
 }
 
+#if defined(__clang__) && defined(__has_warning)
+# if __has_warning( "-Wstring-plus-int" )
+#  pragma clang diagnostic ignored "-Wstring-plus-int"
+# endif
+#endif
+
 int main()
 {
     int x = 0;