diff --git a/include/boost/core/type_name.hpp b/include/boost/core/type_name.hpp
index f155943..5512c0c 100644
--- a/include/boost/core/type_name.hpp
+++ b/include/boost/core/type_name.hpp
@@ -632,7 +632,12 @@ template<class R, class T> std::string type_name( tn_identity<R T::*>, std::stri
     return type_name( tn_identity<R>(), ' ' + type_name( tn_identity<T>(), "" ) + "::*" + suffix );
 }
 
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1900 && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if defined(BOOST_MSVC) && BOOST_MSVC < 1900 && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+template<class R, class T, class... A> std::string type_name( tn_identity<R(T::*)(A...)>, std::string const& suffix )
+{
+    return function_type_name( tn_identity<R(A...)>(), "", ' ' + type_name( tn_identity<T>(), "" ) + "::*" + suffix );
+}
 
 template<class R, class T, class... A> std::string type_name( tn_identity<R(T::*)(A...) const>, std::string const& suffix )
 {
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index a55abc2..1fcaba5 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -232,7 +232,7 @@ run no_exceptions_support_test.cpp ;
 run no_exceptions_support_test.cpp : : : <exception-handling>off : no_exceptions_support_test_nx ;
 
 run cmath_test.cpp ;
-run cmath_test.cpp : : : <define>BOOST_CORE_USE_GENERIC_CMATH : cmath_test_generic ;
+run cmath_test.cpp : : : <define>BOOST_CORE_USE_GENERIC_CMATH <toolset>msvc-8.0:<build>no : cmath_test_generic ;
 
 run bit_cast_test.cpp ;
 run bit_rotate_test.cpp ;
diff --git a/test/type_name_test.cpp b/test/type_name_test.cpp
index e6574cb..6b61def 100644
--- a/test/type_name_test.cpp
+++ b/test/type_name_test.cpp
@@ -203,7 +203,7 @@ int main()
     TEST(A volatile[]);
     TEST(A const volatile[]);
 
-#if !defined(BOOST_MSVC) || BOOST_MSVC >= 1500
+#if !defined(BOOST_MSVC) || BOOST_MSVC >= 1700
     TEST(A(&)[]);
 #endif
     TEST(A const(***)[]);
@@ -219,7 +219,7 @@ int main()
     TEST(A[][2][3]);
     TEST(A const[][2][3]);
 
-#if !defined(BOOST_MSVC) || BOOST_MSVC >= 1500
+#if !defined(BOOST_MSVC) || BOOST_MSVC >= 1700
     TEST(A(&)[][2][3]);
 #endif
     TEST(A const(***)[][2][3]);