diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index d3ba574..7064eb9 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -20,7 +20,38 @@ project
      : <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
        <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
      ;
-   
+
+   rule cxx03 ( properties * )
+   {
+      local result ;
+
+      if <toolset>gcc in $(properties) || <toolset>clang in $(properties)
+      {
+         result = <cxxflags>-std=c++03 ;
+      }
+      else
+      {
+         result = <build>no ;
+      }
+
+      return $(result) ;
+   }
+
+   rule cxx11 ( properties * )
+   {
+      local result ;
+
+      if <toolset>gcc in $(properties) || <toolset>clang in $(properties)
+      {
+         result = <cxxflags>-std=c++11 ;
+      }
+      else
+      {
+         result = <build>no ;
+      }
+
+      return $(result) ;
+   }
 
    test-suite "system"
        : [ run error_code_test.cpp
@@ -32,6 +63,18 @@ project
          [ run error_code_test.cpp
            :  :  : <link>shared : error_code_test_shared
          ]
+         [ run error_code_test.cpp
+           :  :  : <link>static <conditional>@cxx03 : error_code_test_03
+         ]
+         [ run error_code_test.cpp
+           :  :  : <link>shared <conditional>@cxx03 : error_code_test_shared_03
+         ]
+         [ run error_code_test.cpp
+           :  :  : <link>static <conditional>@cxx11 : error_code_test_11
+         ]
+         [ run error_code_test.cpp
+           :  :  : <link>shared <conditional>@cxx11 : error_code_test_shared_11
+         ]
          [ run error_code_user_test.cpp
            :  :  : <link>static
          ]