diff --git a/include/boost/preprocessor/config/limits.hpp b/include/boost/preprocessor/config/limits.hpp
index 71fa073..93a241b 100644
--- a/include/boost/preprocessor/config/limits.hpp
+++ b/include/boost/preprocessor/config/limits.hpp
@@ -72,9 +72,6 @@
 # if !(BOOST_PP_LIMIT_MAG == 256 || BOOST_PP_LIMIT_MAG == 512 || BOOST_PP_LIMIT_MAG == 1024)
 # undef BOOST_PP_LIMIT_MAG
 # define BOOST_PP_LIMIT_MAG 256
-# if !defined(BOOST_PP_LIMIT_WHILE)
-# define BOOST_PP_LIMIT_WHILE 256
-# endif
 # else
 # if defined(BOOST_PP_LIMIT_WHILE) && BOOST_PP_LIMIT_WHILE < BOOST_PP_LIMIT_MAG
 # undef BOOST_PP_LIMIT_WHILE
@@ -82,11 +79,10 @@
 # if !defined(BOOST_PP_LIMIT_WHILE)
 # define BOOST_PP_LIMIT_WHILE BOOST_PP_LIMIT_MAG
 # endif
-# if defined(BOOST_PP_LIMIT_SEQ)
-# undef BOOST_PP_LIMIT_SEQ
-# endif
+# if !defined(BOOST_PP_LIMIT_SEQ)
 # define BOOST_PP_LIMIT_SEQ BOOST_PP_LIMIT_MAG
 # endif
+# endif
 # else
 # define BOOST_PP_LIMIT_MAG 256
 # if !defined(BOOST_PP_LIMIT_WHILE)
@@ -110,11 +106,6 @@
 # if !(BOOST_PP_LIMIT_VARIADIC == 64 || BOOST_PP_LIMIT_VARIADIC == 128 || BOOST_PP_LIMIT_VARIADIC == 256)
 # undef BOOST_PP_LIMIT_VARIADIC
 # define BOOST_PP_LIMIT_VARIADIC 64
-# else 
-# if defined(BOOST_PP_LIMIT_TUPLE)
-# undef BOOST_PP_LIMIT_TUPLE
-# endif
-# define BOOST_PP_LIMIT_TUPLE BOOST_PP_LIMIT_VARIADIC
 # endif
 # else
 # define BOOST_PP_LIMIT_VARIADIC 64
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index c001319..313fcd6 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -117,14 +117,14 @@ alias preprocessor_v_128
    :   
         [ compile array.cpp : <define>BOOST_PP_LIMIT_TUPLE=128 : array_v_128 ]
         [ compile tuple.cpp : <define>BOOST_PP_LIMIT_TUPLE=128 : tuple_v_128 ]
-        [ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=128 : variadic_v_128 ]
+        [ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=128 <define>BOOST_PP_LIMIT_TUPLE=128 : variadic_v_128 ]
   ;
 
 alias preprocessor_v_256
    :   
         [ compile array.cpp : <define>BOOST_PP_LIMIT_TUPLE=256 : array_v_256 ]
         [ compile tuple.cpp : <define>BOOST_PP_LIMIT_TUPLE=256 : tuple_v_256 ]
-        [ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=256 : variadic_v_256 ]
+        [ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=256 <define>BOOST_PP_LIMIT_TUPLE=256 : variadic_v_256 ]
   ;
   
 alias preprocessor_v_128_c