diff --git a/example/handle_test_result.hpp b/example/handle_test_result.hpp
index 8e98f3743..64ea9c2e6 100644
--- a/example/handle_test_result.hpp
+++ b/example/handle_test_result.hpp
@@ -118,7 +118,7 @@ void handle_test_result(const boost::math::tools::test_result<T>& result,
                        const char* test_name, 
                        const char* group_name)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -177,7 +177,7 @@ void handle_test_result(const boost::math::tools::test_result<T>& result,
       BOOST_CHECK(bounds.second >= mean_error_found);
    }
    std::cout << std::endl;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }
diff --git a/include/boost/math/bindings/mpfr.hpp b/include/boost/math/bindings/mpfr.hpp
index fa43f3128..6832600d6 100644
--- a/include/boost/math/bindings/mpfr.hpp
+++ b/include/boost/math/bindings/mpfr.hpp
@@ -15,7 +15,7 @@
 #include <boost/lexical_cast.hpp>
 #include <type_traits>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 //
 // We get a lot of warnings from the gmp, mpfr and gmpfrxx headers, 
 // disable them here, so we only see warnings from *our* code:
@@ -26,7 +26,7 @@
 
 #include <gmpfrxx.h>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/bindings/mpreal.hpp b/include/boost/math/bindings/mpreal.hpp
index 58fe5875c..7ba0dec55 100644
--- a/include/boost/math/bindings/mpreal.hpp
+++ b/include/boost/math/bindings/mpreal.hpp
@@ -15,7 +15,7 @@
 #include <boost/lexical_cast.hpp>
 #include <type_traits>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 //
 // We get a lot of warnings from the gmp, mpfr and gmpfrxx headers, 
 // disable them here, so we only see warnings from *our* code:
@@ -26,7 +26,7 @@
 
 #include <mpreal.h>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/bindings/rr.hpp b/include/boost/math/bindings/rr.hpp
index 7a107deae..419b43428 100644
--- a/include/boost/math/bindings/rr.hpp
+++ b/include/boost/math/bindings/rr.hpp
@@ -206,7 +206,7 @@ private:
    template <class V>
    void assign_large_int(V a)
    {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4146)
 #endif
@@ -225,7 +225,7 @@ private:
       }
       if(neg)
          m_value = -m_value;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
    }
diff --git a/include/boost/math/complex/acos.hpp b/include/boost/math/complex/acos.hpp
index 5c118aa94..9da98ca8f 100644
--- a/include/boost/math/complex/acos.hpp
+++ b/include/boost/math/complex/acos.hpp
@@ -44,7 +44,7 @@ std::complex<T> acos(const std::complex<T>& z)
    static const T log_two = boost::math::constants::ln_two<T>();
    static const T quarter_pi = s_pi / 4;
    
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -235,7 +235,7 @@ std::complex<T> acos(const std::complex<T>& z)
       imag = (boost::math::changesign)(imag);
 
    return std::complex<T>(real, imag);
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }
diff --git a/include/boost/math/complex/asin.hpp b/include/boost/math/complex/asin.hpp
index 142171cff..0d37ee3d7 100644
--- a/include/boost/math/complex/asin.hpp
+++ b/include/boost/math/complex/asin.hpp
@@ -43,7 +43,7 @@ inline std::complex<T> asin(const std::complex<T>& z)
    static const T half_pi = s_pi / 2;
    static const T log_two = boost::math::constants::ln_two<T>();
    static const T quarter_pi = s_pi / 4;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -242,7 +242,7 @@ inline std::complex<T> asin(const std::complex<T>& z)
       imag = (boost::math::changesign)(imag);
 
    return std::complex<T>(real, imag);
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }
diff --git a/include/boost/math/complex/atanh.hpp b/include/boost/math/complex/atanh.hpp
index 35d57bde4..c54559099 100644
--- a/include/boost/math/complex/atanh.hpp
+++ b/include/boost/math/complex/atanh.hpp
@@ -47,7 +47,7 @@ std::complex<T> atanh(const std::complex<T>& z)
    static const T zero = static_cast<T>(0);
    static const T log_two = boost::math::constants::ln_two<T>();
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -204,7 +204,7 @@ std::complex<T> atanh(const std::complex<T>& z)
          imag = (boost::math::changesign)(imag);
    }
    return std::complex<T>(real, imag);
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }
diff --git a/include/boost/math/concepts/distributions.hpp b/include/boost/math/concepts/distributions.hpp
index 865a3ea48..0ca351f98 100644
--- a/include/boost/math/concepts/distributions.hpp
+++ b/include/boost/math/concepts/distributions.hpp
@@ -15,7 +15,7 @@
 
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/fwd.hpp>
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4100)
 #pragma warning(disable: 4510)
@@ -23,7 +23,7 @@
 #pragma warning(disable: 4189) // local variable is initialized but not referenced.
 #endif
 #include <boost/concept_check.hpp>
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 #include <utility>
diff --git a/include/boost/math/concepts/real_type_concept.hpp b/include/boost/math/concepts/real_type_concept.hpp
index 1156852f2..42b4a5ee0 100644
--- a/include/boost/math/concepts/real_type_concept.hpp
+++ b/include/boost/math/concepts/real_type_concept.hpp
@@ -8,13 +8,13 @@
 
 #include <cmath>
 #include <boost/config.hpp>
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4100)
 #pragma warning(disable: 4510)
 #pragma warning(disable: 4610)
 #endif
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 #include <boost/math/tools/config.hpp>
diff --git a/include/boost/math/constants/constants.hpp b/include/boost/math/constants/constants.hpp
index 4ed08fb49..1664790e0 100644
--- a/include/boost/math/constants/constants.hpp
+++ b/include/boost/math/constants/constants.hpp
@@ -12,11 +12,11 @@
 #include <boost/math/policies/policy.hpp>
 #include <boost/math/tools/precision.hpp>
 #include <boost/math/tools/convert_from_string.hpp>
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4127 4701)
 #endif
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 #include <utility>
diff --git a/include/boost/math/constants/info.hpp b/include/boost/math/constants/info.hpp
index e3e6a517d..4d467662a 100644
--- a/include/boost/math/constants/info.hpp
+++ b/include/boost/math/constants/info.hpp
@@ -46,7 +46,7 @@ template <class T, class Policy>
 void print_info_on_type(std::ostream& os = std::cout BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(T) BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(Policy))
 {
    using detail::nameof;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -147,7 +147,7 @@ void print_info_on_type(std::ostream& os = std::cout BOOST_MATH_APPEND_EXPLICIT_
       break;
    }
    os << std::endl;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }
diff --git a/include/boost/math/distributions/chi_squared.hpp b/include/boost/math/distributions/chi_squared.hpp
index 1250a9a85..8c7b0e07a 100644
--- a/include/boost/math/distributions/chi_squared.hpp
+++ b/include/boost/math/distributions/chi_squared.hpp
@@ -55,7 +55,7 @@ private:
 
 typedef chi_squared_distribution<double> chi_squared;
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -74,7 +74,7 @@ inline const std::pair<RealType, RealType> range(const chi_squared_distribution<
   }
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/detail/common_error_handling.hpp b/include/boost/math/distributions/detail/common_error_handling.hpp
index 486fb0b5c..b91d2036f 100644
--- a/include/boost/math/distributions/detail/common_error_handling.hpp
+++ b/include/boost/math/distributions/detail/common_error_handling.hpp
@@ -14,7 +14,7 @@
 // using boost::math::isfinite;
 // using boost::math::isnan;
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4702) // unreachable code (return after domain_error throw).
 #endif
@@ -216,7 +216,7 @@ inline bool check_finite(
 } // namespace math
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/detail/derived_accessors.hpp b/include/boost/math/distributions/detail/derived_accessors.hpp
index fb2e89dc6..9101c8ae1 100644
--- a/include/boost/math/distributions/detail/derived_accessors.hpp
+++ b/include/boost/math/distributions/detail/derived_accessors.hpp
@@ -30,7 +30,7 @@
 #include <cmath>
 #include <boost/math/tools/assert.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4723) // potential divide by 0
 // Suppressing spurious warning in coefficient_of_variation
@@ -156,7 +156,7 @@ inline typename Dist::value_type median(const Dist& d)
 } // namespace boost
 
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/detail/hypergeometric_cdf.hpp b/include/boost/math/distributions/detail/hypergeometric_cdf.hpp
index 638cab6e6..367f9c429 100644
--- a/include/boost/math/distributions/detail/hypergeometric_cdf.hpp
+++ b/include/boost/math/distributions/detail/hypergeometric_cdf.hpp
@@ -16,7 +16,7 @@ namespace boost{ namespace math{ namespace detail{
    template <class T, class Policy>
    T hypergeometric_cdf_imp(unsigned x, unsigned r, unsigned n, unsigned N, bool invert, const Policy& pol)
    {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable:4267)
 #endif
@@ -63,7 +63,7 @@ namespace boost{ namespace math{ namespace detail{
       if(invert)
          result = 1 - result;
       return result;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
    }
diff --git a/include/boost/math/distributions/detail/hypergeometric_pdf.hpp b/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
index 2e4e6c704..220c8d8e0 100644
--- a/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
+++ b/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
@@ -270,7 +270,7 @@ struct hypergeometric_pdf_prime_loop_result_entry
    const hypergeometric_pdf_prime_loop_result_entry* next;
 };
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4510 4512 4610)
 #endif
@@ -285,7 +285,7 @@ struct hypergeometric_pdf_prime_loop_data
    unsigned current_prime;
 };
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/detail/hypergeometric_quantile.hpp b/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
index 8908ee1d4..9b9445384 100644
--- a/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
+++ b/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
@@ -104,7 +104,7 @@ inline unsigned round_x_from_q(unsigned x, T /*q*/, T /*cum*/, T /*fudge_factor*
 template <class T, class Policy>
 unsigned hypergeometric_quantile_imp(T p, T q, unsigned r, unsigned n, unsigned N, const Policy& pol)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable:4267)
 #endif
@@ -219,7 +219,7 @@ unsigned hypergeometric_quantile_imp(T p, T q, unsigned r, unsigned n, unsigned
       }
       return round_x_from_q(x, q, result, fudge_factor, base, lim, discrete_quantile_type());
    }
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
 }
diff --git a/include/boost/math/distributions/detail/inv_discrete_quantile.hpp b/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
index 80137a40f..25216e88f 100644
--- a/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
+++ b/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
@@ -316,7 +316,7 @@ inline typename Dist::value_type round_to_floor(const Dist& d, typename Dist::va
    return result;
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -350,7 +350,7 @@ inline typename Dist::value_type round_to_ceil(const Dist& d, typename Dist::val
    return result;
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 //
diff --git a/include/boost/math/distributions/exponential.hpp b/include/boost/math/distributions/exponential.hpp
index 949afabaf..0c3776828 100644
--- a/include/boost/math/distributions/exponential.hpp
+++ b/include/boost/math/distributions/exponential.hpp
@@ -13,7 +13,7 @@
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4127) // conditional expression is constant
 # pragma warning(disable: 4702) // unreachable code (return after domain_error throw).
@@ -270,7 +270,7 @@ inline RealType entropy(const exponential_distribution<RealType, Policy>& dist)
 } // namespace math
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/extreme_value.hpp b/include/boost/math/distributions/extreme_value.hpp
index 495e50ce3..397ca51a4 100644
--- a/include/boost/math/distributions/extreme_value.hpp
+++ b/include/boost/math/distributions/extreme_value.hpp
@@ -23,7 +23,7 @@
 #include <utility>
 #include <cmath>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4702) // unreachable code (return after domain_error throw).
 #endif
@@ -288,7 +288,7 @@ inline RealType kurtosis_excess(const extreme_value_distribution<RealType, Polic
 } // namespace math
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/hyperexponential.hpp b/include/boost/math/distributions/hyperexponential.hpp
index 2342748ba..18830dc0f 100644
--- a/include/boost/math/distributions/hyperexponential.hpp
+++ b/include/boost/math/distributions/hyperexponential.hpp
@@ -631,7 +631,7 @@ RealT mode(hyperexponential_distribution<RealT,PolicyT> const& /*dist*/)
 
 }} // namespace boost::math
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning (pop)
 #endif
 // This include must be at the end, *after* the accessors
diff --git a/include/boost/math/distributions/hypergeometric.hpp b/include/boost/math/distributions/hypergeometric.hpp
index 21449638d..b0915c5c4 100644
--- a/include/boost/math/distributions/hypergeometric.hpp
+++ b/include/boost/math/distributions/hypergeometric.hpp
@@ -95,7 +95,7 @@ namespace boost { namespace math {
    template <class RealType, class Policy>
    inline const std::pair<unsigned, unsigned> range(const hypergeometric_distribution<RealType, Policy>& dist)
    { // Range of permissible values for random variable x.
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable:4267)
 #endif
@@ -105,7 +105,7 @@ namespace boost { namespace math {
       unsigned l = static_cast<unsigned>((std::max)(0, (int)(n + r) - (int)(N)));
       unsigned u = (std::min)(r, n);
       return std::pair<unsigned, unsigned>(l, u);
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
    }
diff --git a/include/boost/math/distributions/laplace.hpp b/include/boost/math/distributions/laplace.hpp
index 798ce7865..2033244d6 100644
--- a/include/boost/math/distributions/laplace.hpp
+++ b/include/boost/math/distributions/laplace.hpp
@@ -24,7 +24,7 @@
 
 namespace boost{ namespace math{
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable:4127) // conditional expression is constant
 #endif
@@ -340,7 +340,7 @@ inline RealType entropy(const laplace_distribution<RealType, Policy> & dist)
    return log(2*dist.scale()*constants::e<RealType>());
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/normal.hpp b/include/boost/math/distributions/normal.hpp
index f555192bc..b9697ebb0 100644
--- a/include/boost/math/distributions/normal.hpp
+++ b/include/boost/math/distributions/normal.hpp
@@ -71,7 +71,7 @@ private:
 
 typedef normal_distribution<double> normal;
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -104,7 +104,7 @@ inline const std::pair<RealType, RealType> support(const normal_distribution<Rea
   }
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/rayleigh.hpp b/include/boost/math/distributions/rayleigh.hpp
index 2920776ad..682f00505 100644
--- a/include/boost/math/distributions/rayleigh.hpp
+++ b/include/boost/math/distributions/rayleigh.hpp
@@ -13,7 +13,7 @@
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4702) // unreachable code (return after domain_error throw).
 #endif
@@ -296,7 +296,7 @@ inline RealType entropy(const rayleigh_distribution<RealType, Policy>& dist)
 } // namespace math
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/distributions/students_t.hpp b/include/boost/math/distributions/students_t.hpp
index c8d9f8bcf..961530a70 100644
--- a/include/boost/math/distributions/students_t.hpp
+++ b/include/boost/math/distributions/students_t.hpp
@@ -21,7 +21,7 @@
 
 #include <utility>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4702) // unreachable code (return after domain_error throw).
 #endif
@@ -494,7 +494,7 @@ inline RealType entropy(const students_t_distribution<RealType, Policy>& dist)
 } // namespace math
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/policies/error_handling.hpp b/include/boost/math/policies/error_handling.hpp
index 9cfb2ec53..c8585753c 100644
--- a/include/boost/math/policies/error_handling.hpp
+++ b/include/boost/math/policies/error_handling.hpp
@@ -22,7 +22,7 @@
 #include <boost/math/tools/precision.hpp>
 #include <boost/math/tools/throw_exception.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push) // Quiet warnings in boost/format.hpp
 #  pragma warning(disable: 4996) // _SCL_SECURE_NO_DEPRECATE
 #  pragma warning(disable: 4512) // assignment operator could not be generated.
@@ -837,7 +837,7 @@ std::pair<T, T> pair_from_single(const T& val) BOOST_MATH_NOEXCEPT(T)
 
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/special_functions/detail/hypergeometric_asym.hpp b/include/boost/math/special_functions/detail/hypergeometric_asym.hpp
index bd2294177..b3f3c3f93 100644
--- a/include/boost/math/special_functions/detail/hypergeometric_asym.hpp
+++ b/include/boost/math/special_functions/detail/hypergeometric_asym.hpp
@@ -13,7 +13,7 @@
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/hypergeometric_2F0.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -172,7 +172,7 @@
 
   } } } // namespaces
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/special_functions/detail/unchecked_factorial.hpp b/include/boost/math/special_functions/detail/unchecked_factorial.hpp
index 8e7626907..30ab93e7f 100644
--- a/include/boost/math/special_functions/detail/unchecked_factorial.hpp
+++ b/include/boost/math/special_functions/detail/unchecked_factorial.hpp
@@ -10,14 +10,14 @@
 #pragma once
 #endif
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push) // Temporary until lexical cast fixed.
 #pragma warning(disable: 4127 4701)
 #endif
 #ifndef BOOST_MATH_NO_LEXICAL_CAST
 #include <boost/lexical_cast.hpp>
 #endif
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 #include <cmath>
diff --git a/include/boost/math/special_functions/expint.hpp b/include/boost/math/special_functions/expint.hpp
index f4211e856..bad42f488 100644
--- a/include/boost/math/special_functions/expint.hpp
+++ b/include/boost/math/special_functions/expint.hpp
@@ -463,7 +463,7 @@ T expint_imp(unsigned n, T z, const Policy& pol, const Tag& tag)
    {
       f = z < (static_cast<T>(n - 2) / static_cast<T>(n - 1));
    }
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable:4127) // conditional expression is constant
 #endif
@@ -477,7 +477,7 @@ T expint_imp(unsigned n, T z, const Policy& pol, const Tag& tag)
       result = expint_as_series(n, z, pol);
    else
       result = expint_as_fraction(n, z, pol);
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/special_functions/factorials.hpp b/include/boost/math/special_functions/factorials.hpp
index 27309ecba..02cca91a8 100644
--- a/include/boost/math/special_functions/factorials.hpp
+++ b/include/boost/math/special_functions/factorials.hpp
@@ -14,11 +14,11 @@
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/detail/unchecked_factorial.hpp>
 #include <array>
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push) // Temporary until lexical cast fixed.
 #pragma warning(disable: 4127 4701)
 #endif
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 #include <type_traits>
diff --git a/include/boost/math/special_functions/fpclassify.hpp b/include/boost/math/special_functions/fpclassify.hpp
index a5b757c01..019596f8a 100644
--- a/include/boost/math/special_functions/fpclassify.hpp
+++ b/include/boost/math/special_functions/fpclassify.hpp
@@ -101,7 +101,7 @@ namespace boost{
 //
 namespace math_detail{
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4800)
 #endif
@@ -119,7 +119,7 @@ inline bool is_nan_helper(T t, const std::true_type&)
 #endif
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/special_functions/gamma.hpp b/include/boost/math/special_functions/gamma.hpp
index c00b96630..ef26bf6b0 100644
--- a/include/boost/math/special_functions/gamma.hpp
+++ b/include/boost/math/special_functions/gamma.hpp
@@ -39,7 +39,7 @@
 #include <algorithm>
 #include <type_traits>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4702) // unreachable code (return after domain_error throw).
 # pragma warning(disable: 4127) // conditional expression is constant.
@@ -2206,7 +2206,7 @@ inline typename tools::promote_args<T1, T2>::type
 } // namespace math
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/special_functions/hypot.hpp b/include/boost/math/special_functions/hypot.hpp
index c33135059..bfa797de8 100644
--- a/include/boost/math/special_functions/hypot.hpp
+++ b/include/boost/math/special_functions/hypot.hpp
@@ -30,7 +30,7 @@ T hypot_imp(T x, T y, const Policy& pol)
    x = fabs(x);
    y = fabs(y);
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push) 
 #pragma warning(disable: 4127)
 #endif
@@ -39,7 +39,7 @@ T hypot_imp(T x, T y, const Policy& pol)
       && ((x == std::numeric_limits<T>::infinity())
       || (y == std::numeric_limits<T>::infinity())))
       return policies::raise_overflow_error<T>("boost::math::hypot<%1%>(%1%,%1%)", 0, pol);
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/special_functions/owens_t.hpp b/include/boost/math/special_functions/owens_t.hpp
index 1f2e270ac..f96d6648e 100644
--- a/include/boost/math/special_functions/owens_t.hpp
+++ b/include/boost/math/special_functions/owens_t.hpp
@@ -27,7 +27,7 @@
 #include <stdexcept>
 #include <cmath>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -1082,7 +1082,7 @@ namespace boost
    } // namespace math
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/special_functions/pow.hpp b/include/boost/math/special_functions/pow.hpp
index f46f68939..753ac208b 100644
--- a/include/boost/math/special_functions/pow.hpp
+++ b/include/boost/math/special_functions/pow.hpp
@@ -22,7 +22,7 @@
 namespace boost {
 namespace math {
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4702) // Unreachable code, only triggered in release mode and /W4
 #endif
@@ -130,7 +130,7 @@ template <int N, typename T>
 BOOST_CXX14_CONSTEXPR inline typename tools::promote_args<T>::type pow(T base)
 { return pow<N>(base, policies::policy<>()); }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include/boost/math/tools/config.hpp b/include/boost/math/tools/config.hpp
index 1a9c547c0..1f8cef7bb 100644
--- a/include/boost/math/tools/config.hpp
+++ b/include/boost/math/tools/config.hpp
@@ -164,7 +164,7 @@
 //
 // Tune performance options for specific compilers:
 //
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  define BOOST_MATH_POLY_METHOD 2
 #if BOOST_MSVC <= 1900
 #  define BOOST_MATH_RATIONAL_METHOD 1
diff --git a/include/boost/math/tools/polynomial.hpp b/include/boost/math/tools/polynomial.hpp
index 9a5750bba..635bcf668 100644
--- a/include/boost/math/tools/polynomial.hpp
+++ b/include/boost/math/tools/polynomial.hpp
@@ -390,7 +390,7 @@ public:
 
    polynomial<T> prime() const
    {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
       // Disable int->float conversion warning:
 #pragma warning(push)
 #pragma warning(disable:4244)
@@ -405,7 +405,7 @@ public:
           p_data[i] = m_data[i+1]*static_cast<T>(i+1);
       }
       return polynomial<T>(std::move(p_data));
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
    }
diff --git a/include/boost/math/tools/precision.hpp b/include/boost/math/tools/precision.hpp
index 9ecb91431..ef8f47d93 100644
--- a/include/boost/math/tools/precision.hpp
+++ b/include/boost/math/tools/precision.hpp
@@ -194,7 +194,7 @@ struct log_limit_noexcept_traits : public log_limit_noexcept_traits_imp<T, std::
 
 } // namespace detail
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4309)
 #endif
@@ -225,7 +225,7 @@ inline constexpr T log_min_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(
 #endif
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include_private/boost/math/tools/solve.hpp b/include_private/boost/math/tools/solve.hpp
index b4259f663..f524414a8 100644
--- a/include_private/boost/math/tools/solve.hpp
+++ b/include_private/boost/math/tools/solve.hpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/math/tools/assert.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4996 4267 4244)
 #endif
@@ -22,7 +22,7 @@
 #include <boost/numeric/ublas/matrix.hpp>
 #include <boost/numeric/ublas/vector.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/include_private/boost/math/tools/test.hpp b/include_private/boost/math/tools/test.hpp
index 312d056b4..24af7fc5a 100644
--- a/include_private/boost/math/tools/test.hpp
+++ b/include_private/boost/math/tools/test.hpp
@@ -69,7 +69,7 @@ T relative_error(T a, T b)
 template <class T>
 void set_output_precision(T, std::ostream& os)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -80,7 +80,7 @@ void set_output_precision(T, std::ostream& os)
    else
       os << std::setprecision(22); // and hope for the best!
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }
diff --git a/include_private/boost/math/tools/test_data.hpp b/include_private/boost/math/tools/test_data.hpp
index 8b193e8f8..7d0abee85 100644
--- a/include_private/boost/math/tools/test_data.hpp
+++ b/include_private/boost/math/tools/test_data.hpp
@@ -12,14 +12,14 @@
 
 #include <boost/math/tools/config.hpp>
 #include <boost/math/tools/assert.hpp>
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable: 4127 4701 4512)
 #  pragma warning(disable: 4130) // '==' : logical operation on address of string constant.
 #endif
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/lexical_cast.hpp>
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 #include <boost/type_traits/is_floating_point.hpp>
@@ -39,7 +39,7 @@ namespace random_ns = boost::random;
 #include <vector>
 #include <iostream>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable: 4130) // '==' : logical operation on address of string constant.
 // Used as a warning with BOOST_MATH_ASSERT
@@ -593,7 +593,7 @@ void test_data<T>::create_test_points(std::set<T>& points, const parameter_info<
 template <class T>
 bool get_user_parameter_info(parameter_info<T>& info, const char* param_name)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable: 4127)
 #endif
@@ -865,7 +865,7 @@ bool get_user_parameter_info(parameter_info<T>& info, const char* param_name)
    }
 
    return true;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
 }
@@ -957,7 +957,7 @@ std::ostream& write_code(std::ostream& os,
 } // namespace math
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/reporting/performance/table_helper.cpp b/reporting/performance/table_helper.cpp
index 463120cdf..0fc84e141 100644
--- a/reporting/performance/table_helper.cpp
+++ b/reporting/performance/table_helper.cpp
@@ -365,7 +365,7 @@ std::string get_compiler_options_name()
 {
 #if defined(BOOST_MSVC) || defined(__ICL)
    std::string result;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    result = "cl ";
 #else
    result = "icl ";
diff --git a/test/exp_sinh_quadrature_test.cpp b/test/exp_sinh_quadrature_test.cpp
index 9a7f47514..78105c7ac 100644
--- a/test/exp_sinh_quadrature_test.cpp
+++ b/test/exp_sinh_quadrature_test.cpp
@@ -65,7 +65,7 @@ using boost::math::quadrature::exp_sinh;
 #  define TEST10
 #endif
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning (disable:4127)
 #endif
 
diff --git a/test/handle_test_result.hpp b/test/handle_test_result.hpp
index 5d9aa904e..eec314284 100644
--- a/test/handle_test_result.hpp
+++ b/test/handle_test_result.hpp
@@ -118,7 +118,7 @@ void handle_test_result(const boost::math::tools::test_result<T>& result,
                        const char* test_name, 
                        const char* group_name)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -170,7 +170,7 @@ void handle_test_result(const boost::math::tools::test_result<T>& result,
       BOOST_CHECK(bounds.second >= mean_error_found);
    }
    std::cout << std::endl;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }
diff --git a/test/quaternion_test.cpp b/test/quaternion_test.cpp
index f15845172..41af27e99 100644
--- a/test/quaternion_test.cpp
+++ b/test/quaternion_test.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/math/quaternion.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127) // conditional expression is constant
 #endif
 
diff --git a/test/test_1F1.hpp b/test/test_1F1.hpp
index c9aa61e04..20fb35ed5 100644
--- a/test/test_1F1.hpp
+++ b/test/test_1F1.hpp
@@ -25,7 +25,7 @@
 #include <boost/math/special_functions/hypergeometric_1F1.hpp>
 #include <boost/math/quadrature/exp_sinh.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127)
 #endif
 
diff --git a/test/test_1F1_log.hpp b/test/test_1F1_log.hpp
index 52103fc28..28ec4c0d5 100644
--- a/test/test_1F1_log.hpp
+++ b/test/test_1F1_log.hpp
@@ -25,7 +25,7 @@
 #include <boost/math/special_functions/hypergeometric_1F1.hpp>
 #include <boost/math/quadrature/exp_sinh.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127)
 #endif
 
diff --git a/test/test_1F1_regularized.hpp b/test/test_1F1_regularized.hpp
index 9a905fe07..90415c6de 100644
--- a/test/test_1F1_regularized.hpp
+++ b/test/test_1F1_regularized.hpp
@@ -25,7 +25,7 @@
 #include <boost/math/special_functions/hypergeometric_1F1.hpp>
 #include <boost/math/quadrature/exp_sinh.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127)
 #endif
 
diff --git a/test/test_bessel_hooks.hpp b/test/test_bessel_hooks.hpp
index c089e4acf..a18c928d7 100644
--- a/test/test_bessel_hooks.hpp
+++ b/test/test_bessel_hooks.hpp
@@ -22,7 +22,7 @@ inline double cyl_bessel_j(double a, double x)
 { return jv(a, x); }
 inline long double cyl_bessel_j(long double a, long double x)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return jv((double)a, x); 
 #else
    return jvl(a, x); 
@@ -34,7 +34,7 @@ inline double cyl_neumann(double a, double x)
 { return yv(a, x); }
 inline long double cyl_neumann(long double a, long double x)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return yv((double)a, x); 
 #else
    return yvl(a, x); 
diff --git a/test/test_beta_hooks.hpp b/test/test_beta_hooks.hpp
index 4f512cd53..071b86337 100644
--- a/test/test_beta_hooks.hpp
+++ b/test/test_beta_hooks.hpp
@@ -21,7 +21,7 @@ inline float beta(float a, float b)
 { return betaf(a, b); }
 inline long double beta(long double a, long double b)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return beta((double)a, (double)b); 
 #else
    return betal(a, b); 
@@ -33,7 +33,7 @@ inline double ibeta(double a, double b, double x)
 { return incbet(a, b, x); }
 inline long double ibeta(long double a, long double b, long double x)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return incbet((double)a, (double)b, (double)x); 
 #else
    return incbetl(a, b); 
diff --git a/test/test_erf_hooks.hpp b/test/test_erf_hooks.hpp
index e1c42af50..a06d883a7 100644
--- a/test/test_erf_hooks.hpp
+++ b/test/test_erf_hooks.hpp
@@ -47,7 +47,7 @@ inline float erf(float a)
 { return erff(a); }
 inline long double erf(long double a)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return erf((double)a); 
 #else
    return erfl(a); 
@@ -62,7 +62,7 @@ inline float erfc(float a)
 { return erfcf(a); }
 inline long double erfc(long double a)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return erfc((double)a); 
 #else
    return erfcl(a); 
diff --git a/test/test_expint_hooks.hpp b/test/test_expint_hooks.hpp
index 89b5fc89a..d7c8bcab6 100644
--- a/test/test_expint_hooks.hpp
+++ b/test/test_expint_hooks.hpp
@@ -20,7 +20,7 @@ inline double expint(unsigned n, double a)
 { return expn(n, a); }
 inline long double expint(unsigned n, long double a)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return expn(n, (double)a); 
 #else
    return expnl(n, a); 
diff --git a/test/test_gamma.hpp b/test/test_gamma.hpp
index 4ac35b5df..a37e8e985 100644
--- a/test/test_gamma.hpp
+++ b/test/test_gamma.hpp
@@ -217,7 +217,7 @@ void test_spots(T, const char* name)
       BOOST_CHECK_CLOSE(::boost::math::tgamma(-4 - ldexp(static_cast<T>(1), -55)), static_cast<T>(-1.50119987579016527057843048200831672241827850458884790004313e15L), tolerance * extra_tol);
    }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -226,7 +226,7 @@ void test_spots(T, const char* name)
    {
       BOOST_CHECK_CLOSE(::boost::math::tgamma(static_cast<T>(142.75)), static_cast<T>(7.8029496083318133344429227511387928576820621466e244L), tolerance * 4);
    }
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
    // An extra fudge factor for real_concept which has a less accurate tgamma:
diff --git a/test/test_gamma_hooks.hpp b/test/test_gamma_hooks.hpp
index b07c5b83a..60df89b9d 100644
--- a/test/test_gamma_hooks.hpp
+++ b/test/test_gamma_hooks.hpp
@@ -28,7 +28,7 @@ inline double tgamma(double x)
 { return gamma(x); }
 inline long double tgamma(long double x)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return gamma((double)x); 
 #else
    return gammal(x); 
@@ -40,7 +40,7 @@ inline double lgamma(double x)
 { return lgam(x); }
 inline long double lgamma(long double x)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return lgam((double)x); 
 #else
    return lgaml(x); 
@@ -52,7 +52,7 @@ inline double gamma_q(double x, double y)
 { return igamc(x, y); }
 inline long double gamma_q(long double x, long double y)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return igamc((double)x, (double)y); 
 #else
    return igamcl(x, y); 
@@ -64,7 +64,7 @@ inline double gamma_p(double x, double y)
 { return igam(x, y); }
 inline long double gamma_p(long double x, long double y)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return igam((double)x, (double)y); 
 #else
    return igaml(x, y); 
diff --git a/test/test_next.cpp b/test/test_next.cpp
index 5ef423060..94312976a 100644
--- a/test/test_next.cpp
+++ b/test/test_next.cpp
@@ -16,7 +16,7 @@
 #include <iostream>
 #include <iomanip>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127)
 #endif
 
diff --git a/test/test_next_decimal.cpp b/test/test_next_decimal.cpp
index 99f5268a7..4c9e46c4c 100644
--- a/test/test_next_decimal.cpp
+++ b/test/test_next_decimal.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <iomanip>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127)
 #endif
 
diff --git a/test/test_out_of_range.hpp b/test/test_out_of_range.hpp
index e2b17e8a6..a8c93576f 100644
--- a/test/test_out_of_range.hpp
+++ b/test/test_out_of_range.hpp
@@ -30,7 +30,7 @@ but does *not* check finite but out-of-range parameters to the constructor
 because these are specific to each distribution.
 */
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -168,7 +168,7 @@ void check_out_of_range(typename Distro::value_type p1, typename Distro::value_t
    }
 }
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/test/test_pFq.hpp b/test/test_pFq.hpp
index 50897ab9c..71c52a855 100644
--- a/test/test_pFq.hpp
+++ b/test/test_pFq.hpp
@@ -25,7 +25,7 @@
 #include <boost/math/special_functions/hypergeometric_pFq.hpp>
 #include <boost/math/special_functions/relative_difference.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127)
 #endif
 
diff --git a/test/test_pFq_precision.cpp b/test/test_pFq_precision.cpp
index 6e030c01e..92968a803 100644
--- a/test/test_pFq_precision.cpp
+++ b/test/test_pFq_precision.cpp
@@ -21,7 +21,7 @@
 #include <boost/multiprecision/mpfr.hpp>
 #include <boost/math/special_functions/relative_difference.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127)
 #endif
 
diff --git a/test/test_recurrence.cpp b/test/test_recurrence.cpp
index 72716964e..753b1b548 100644
--- a/test/test_recurrence.cpp
+++ b/test/test_recurrence.cpp
@@ -16,7 +16,7 @@
 //#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/concepts/real_concept.hpp>
 
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(disable:4127)
 #endif
 
diff --git a/test/test_zeta.hpp b/test/test_zeta.hpp
index 52d92810c..09d24313d 100644
--- a/test/test_zeta.hpp
+++ b/test/test_zeta.hpp
@@ -150,7 +150,7 @@ void test_spots(T, const char* t)
    BOOST_CHECK_CLOSE(::boost::math::zeta(-ldexp(static_cast<T>(1), -32)), static_cast<T>(-0.499999999786042949889995597926798240562852438685508646794693L), tolerance);
    BOOST_CHECK_CLOSE(::boost::math::zeta(-ldexp(static_cast<T>(1), -33)), static_cast<T>(-0.499999999893021474931402198791408471637626205588681812641711L), tolerance);
    BOOST_CHECK_CLOSE(::boost::math::zeta(-ldexp(static_cast<T>(1), -34)), static_cast<T>(-0.499999999946510737462302199352114463422268928922372277519378L), tolerance);
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127 4756)
 #endif
@@ -170,7 +170,7 @@ void test_spots(T, const char* t)
       BOOST_CHECK_EQUAL(::boost::math::zeta(static_cast<T>(-10007)), std::numeric_limits<T>::infinity());
       BOOST_CHECK_EQUAL(::boost::math::zeta(static_cast<T>(-10009)), -std::numeric_limits<T>::infinity());
    }
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }
diff --git a/test/test_zeta_hooks.hpp b/test/test_zeta_hooks.hpp
index 087d87d3e..b3a3b227e 100644
--- a/test/test_zeta_hooks.hpp
+++ b/test/test_zeta_hooks.hpp
@@ -20,7 +20,7 @@ inline double zeta(double a)
 { return 1 + zetac(a); }
 inline long double zeta(long double a)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
    return 1 + zetac((double)a); 
 #else
    return zetacl(a);