diff --git a/include/boost/math/special_functions/math_fwd.hpp b/include/boost/math/special_functions/math_fwd.hpp
index 09cf24c3c..fa8ed0df2 100644
--- a/include/boost/math/special_functions/math_fwd.hpp
+++ b/include/boost/math/special_functions/math_fwd.hpp
@@ -1510,10 +1510,10 @@ template <class OutputIterator, class T>\
    { boost::math::cyl_neumann_zero(v, start_index, number_of_zeros, out_it, Policy()); }\
 \
    template <class T>\
-   inline typename boost::math::tools::promote_args<T>::type sin_pi(T x){ return boost::math::sin_pi(x); }\
+   inline typename boost::math::tools::promote_args<T>::type sin_pi(T x){ return boost::math::sin_pi(x, Policy()); }\
 \
    template <class T>\
-   inline typename boost::math::tools::promote_args<T>::type cos_pi(T x){ return boost::math::cos_pi(x); }\
+   inline typename boost::math::tools::promote_args<T>::type cos_pi(T x){ return boost::math::cos_pi(x, Policy()); }\
 \
    using boost::math::fpclassify;\
    using boost::math::isfinite;\
diff --git a/test/test_no_long_double_policy.cpp b/test/test_no_long_double_policy.cpp
new file mode 100644
index 000000000..f1f43f087
--- /dev/null
+++ b/test/test_no_long_double_policy.cpp
@@ -0,0 +1,100 @@
+
+#include <type_traits>
+#include <cmath>
+
+#define BOOST_MATH_ASSERT_UNDEFINED_POLICY false
+#include <boost/math/tools/config.hpp>
+//
+// Poison the long double std math functions so we can find accidental usage of these
+// when the user has requested that we do *not* use them.
+//
+namespace poison {
+long double abs(long double, void* = 0);
+long double fabs(long double, void* = 0);
+long double sin(long double, void* = 0);
+long double cos(long double, void* = 0);
+long double tan(long double, void* = 0);
+long double asin(long double, void* = 0);
+long double acos(long double, void* = 0);
+long double atan(long double, void* = 0);
+long double exp(long double, void* = 0);
+long double log(long double, void* = 0);
+long double pow(long double, long double, void* = 0);
+long double fmod(long double, long double, void* = 0);
+long double modf(long double, long double*, void* = 0);
+long double cosh(long double, void* = 0);
+long double sinh(long double, void* = 0);
+long double tanh(long double, void* = 0);
+long double frexp(long double, void*);
+long double ldexp(long double, short);
+long double atan2(long double, long double, void* = 0);
+long double ceil(long double, void* = 0);
+long double floor(long double, void* = 0);
+long double log10(long double, void* = 0);
+long double sqrt(long double, void* = 0);
+} // namespace poison
+
+#undef BOOST_MATH_STD_USING_CORE
+#undef BOOST_MATH_STD_USING
+
+#define BOOST_MATH_STD_USING_CORE \
+   using std::abs;                \
+   using std::acos;               \
+   using std::cos;                \
+   using std::fmod;               \
+   using std::modf;               \
+   using std::tan;                \
+   using std::asin;               \
+   using std::cosh;               \
+   using std::frexp;              \
+   using std::pow;                \
+   using std::tanh;               \
+   using std::atan;               \
+   using std::exp;                \
+   using std::ldexp;              \
+   using std::sin;                \
+   using std::atan2;              \
+   using std::fabs;               \
+   using std::log;                \
+   using std::sinh;               \
+   using std::ceil;               \
+   using std::floor;              \
+   using std::log10;              \
+   using std::sqrt;                \
+   using poison::abs;                \
+   using poison::acos;               \
+   using poison::cos;                \
+   using poison::fmod;               \
+   using poison::modf;               \
+   using poison::tan;                \
+   using poison::asin;               \
+   using poison::cosh;               \
+   using poison::frexp;              \
+   using poison::pow;                \
+   using poison::tanh;               \
+   using poison::atan;               \
+   using poison::exp;                \
+   using poison::ldexp;              \
+   using poison::sin;                \
+   using poison::atan2;              \
+   using poison::fabs;               \
+   using poison::log;                \
+   using poison::sinh;               \
+   using poison::ceil;               \
+   using poison::floor;              \
+   using poison::log10;              \
+   using poison::sqrt;
+
+#define BOOST_MATH_STD_USING BOOST_MATH_STD_USING_CORE
+
+
+
+#define TEST_GROUP_5
+#define TEST_GROUP_6
+#include "compile_test/instantiate.hpp"
+
+int main()
+{
+   //boost::math::foo(0.0L);
+   instantiate(0.0);
+}