diff --git a/include/boost/type_traits/composite_traits.hpp b/include/boost/type_traits/composite_traits.hpp
index 01aab6d..43c38fd 100644
--- a/include/boost/type_traits/composite_traits.hpp
+++ b/include/boost/type_traits/composite_traits.hpp
@@ -392,7 +392,7 @@ template <class R, class T, class A0, class A1, class A2, class A3, class A4, cl
 struct is_member_function_pointer<R (T::*)(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28)>{ BOOST_STATIC_CONSTANT(bool, value = true); };
 
 // Metrowerks thinks this creates ambiguities
-# if !defined(__MWERKS__) || __MWERKS__ > 0x2406
+# if !defined(__MWERKS__) || __MWERKS__ > 0x2407
 
 template <class R, class T>
 struct is_member_function_pointer<R (T::*)(void)const>{ BOOST_STATIC_CONSTANT(bool, value = true); };
diff --git a/tests/composite_traits_test.cpp b/tests/composite_traits_test.cpp
index 9589284..f53c13e 100644
--- a/tests/composite_traits_test.cpp
+++ b/tests/composite_traits_test.cpp
@@ -146,7 +146,7 @@ unsigned int expected_failures = 1; // can't handle cv-qualified references
 # endif
 #elif defined(BOOST_MSVC)
 unsigned int expected_failures = 0;
-#elif defined(__MWERKS__) || defined(__HP_aCC)
+#elif defined(__MWERKS__) && __MWERKS__ <= 0x2407 || defined(__HP_aCC)
 unsigned int expected_failures = 1; // is_enum doesn't work
 #else
 unsigned int expected_failures = 0;