diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index c36c1aa9..a5770d14 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -12,7 +12,7 @@ project boost/test
                    <link>shared,<toolset>msvc:<cxxflags>-wd4275
                    <toolset>msvc:<cxxflags>-wd4671
                    <toolset>msvc:<cxxflags>-wd4673
-                   #<toolset>gcc:<cxxflags>-std=gnu++0x
+                   <toolset>gcc:<cxxflags>-Wno-variadic-macros
                    <toolset>clang:<cxxflags>-Wno-c99-extensions
                    <toolset>clang:<cxxflags>-Wno-variadic-macros
                    <warnings>all
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 6321dba5..904d7c8c 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -41,6 +41,7 @@ rule boost.test-self-test ( test-rule : test-suite : test-name : usage-variant ?
                # So deactivate those warnings again
                <toolset>gcc:<cxxflags>-pedantic
                <toolset>gcc:<cxxflags>-Wno-long-long
+               <toolset>gcc:<cxxflags>-Wno-variadic-macros
                <toolset>clang:<cxxflags>-Wno-c99-extensions
                <warnings>all
                $(extra-options)