diff --git a/cmake/BoostAddWarnings.cmake b/cmake/BoostAddWarnings.cmake
index c468638..12d1854 100644
--- a/cmake/BoostAddWarnings.cmake
+++ b/cmake/BoostAddWarnings.cmake
@@ -15,11 +15,7 @@ function(boost_add_warnings target level)
     message(FATAL_ERROR "${level} is not a valid warning level (${allowed_levels})")
   endif()
   if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(APPLE)
-      set(supression -Wno-long-long)
-    else()
-      set(supression "")
-    endif()
+    set(supression -Wno-long-long)
     set(warn_off -w)
     set(warn_on  -Wall ${supression})
     set(warn_all -Wall ${supression})
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index a84737d..5aa498e 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -11,7 +11,12 @@ import testing ;
 
 project : requirements
   <warnings>pedantic
-  <warnings-as-errors>on ;
+  <warnings-as-errors>on
+  <toolset>gcc:<cxxflags>-Wno-long-long
+  <toolset>darwin:<cxxflags>-Wno-long-long
+  <toolset>pathscale:<cxxflags>-Wno-long-long
+  <toolset>clang:<cxxflags>-Wno-long-long
+  ;
 
 lib shell32 ;