diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 34445705..72d5b5ec 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -5,17 +5,27 @@
 
 import testing ;
 
-project unordered-test/unordered
+# Adding -Wundef is blocked on (at least)
+# https://github.com/boostorg/type_traits/issues/165
+
+local gcc-flags = -Wsign-promo -Wconversion -Wsign-conversion -Wfloat-equal -Wshadow -Wno-variadic-macros ;
+local clang-flags = $(gcc-flags) -Wno-c99-extensions ;
+local msvc-flags = /wd4494 ;
+
+project
     : requirements
+
         <warnings>pedantic
         <toolset>intel:<warnings>on
-        # Would be nice to define -Wundef, but I'm getting warnings from
-        # Boost.Preprocessor on trunk.
-        <toolset>gcc:<cxxflags>"-Wstrict-aliasing -fstrict-aliasing -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow -Wno-variadic-macros"
-        <toolset>darwin:<cxxflags>"-Wstrict-aliasing -fstrict-aliasing -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>clang:<cxxflags>"-Wstrict-aliasing -fstrict-aliasing -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow -Wno-c99-extensions -Wno-variadic-macros"
-        <toolset>msvc:<cxxflags>"/wd4494"
-        <toolset>gcc:<c++-template-depth>500
+
+        <toolset>gcc:<cxxflags>$(gcc-flags)
+        <toolset>darwin:<cxxflags>$(gcc-flags)
+        <toolset>clang:<cxxflags>$(clang-flags)
+        <toolset>msvc:<cxxflags>$(msvc-flags)
+
+        <toolset>gcc:<warnings-as-errors>on
+        <toolset>clang:<warnings-as-errors>on
+        <toolset>msvc:<warnings-as-errors>on
     ;
 
 #alias framework : /boost/test//boost_unit_test_framework ;
diff --git a/test/unordered/mix_policy.cpp b/test/unordered/mix_policy.cpp
index 15308a1f..57c0445b 100644
--- a/test/unordered/mix_policy.cpp
+++ b/test/unordered/mix_policy.cpp
@@ -11,7 +11,7 @@ template<class Policy, class SizeT> void test( SizeT x )
 {
     if( x <= 4 )
     {
-        BOOST_TEST_EQ( Policy::new_bucket_count( x ), 4 );
+        BOOST_TEST_EQ( Policy::new_bucket_count( x ), 4u );
     }
     else
     {