diff --git a/test/pch_light.hpp b/test/pch_light.hpp
index 7d1174a2d..a860443d3 100644
--- a/test/pch_light.hpp
+++ b/test/pch_light.hpp
@@ -5,6 +5,10 @@
 
 #ifdef BOOST_BUILD_PCH_ENABLED
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif 
+
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_carlson.cpp b/test/test_carlson.cpp
index e1b43982b..41b16fae6 100644
--- a/test/test_carlson.cpp
+++ b/test/test_carlson.cpp
@@ -4,8 +4,9 @@
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif 
 #include <pch_light.hpp>
 #include "test_carlson.hpp"
 
diff --git a/test/test_carlson.hpp b/test/test_carlson.hpp
index 1a81965f2..01b196d2d 100644
--- a/test/test_carlson.hpp
+++ b/test/test_carlson.hpp
@@ -4,7 +4,15 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
+#ifdef min
+#undef min
+#endif
+#ifdef max
+#undef max
+#endif
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>