diff --git a/include/boost/iterator/function_output_iterator.hpp b/include/boost/iterator/function_output_iterator.hpp
index ad4adc3..d562475 100644
--- a/include/boost/iterator/function_output_iterator.hpp
+++ b/include/boost/iterator/function_output_iterator.hpp
@@ -27,7 +27,7 @@ namespace iterators {
 
     class output_proxy {
     public:
-      explicit output_proxy(UnaryFunction& f) noexcept : m_f(f) { }
+      explicit output_proxy(UnaryFunction& f) BOOST_NOEXCEPT : m_f(f) { }
 
       template <class T>
 
@@ -39,7 +39,7 @@ namespace iterators {
         return *this;
       }
 
-      BOOST_DEFAULTED_FUNCTION(output_proxy(output_proxy const& that), noexcept : m_f(that.m_f) {})
+      BOOST_DEFAULTED_FUNCTION(output_proxy(output_proxy const& that), BOOST_NOEXCEPT : m_f(that.m_f) {})
       BOOST_DELETED_FUNCTION(output_proxy& operator=(output_proxy const&))
 
     private:
diff --git a/test/is_iterator.cpp b/test/is_iterator.cpp
index 7d67dda..a5aba32 100644
--- a/test/is_iterator.cpp
+++ b/test/is_iterator.cpp
@@ -145,11 +145,11 @@ int main()
     BOOST_TEST(!boost::iterators::is_iterator< int complete::* >::value);
     BOOST_TEST(!boost::iterators::is_iterator< int (complete::*)(int) >::value);
     BOOST_TEST(!boost::iterators::is_iterator< int (complete::*)(int) const >::value);
-#if defined(__cpp_noexcept_function_type) && (__cpp_noexcept_function_type >= 201510L)
-    BOOST_TEST(!boost::iterators::is_iterator< int (*)(int) noexcept >::value);
-    BOOST_TEST(!boost::iterators::is_iterator< int (complete::*)(int) noexcept >::value);
-    BOOST_TEST(!boost::iterators::is_iterator< int (complete::*)(int) const noexcept >::value);
-#endif
+
+    BOOST_TEST(!boost::iterators::is_iterator< int (*)(int) BOOST_NOEXCEPT >::value);
+    BOOST_TEST(!boost::iterators::is_iterator< int (complete::*)(int) BOOST_NOEXCEPT >::value);
+    BOOST_TEST(!boost::iterators::is_iterator< int (complete::*)(int) const BOOST_NOEXCEPT >::value);
+
     BOOST_TEST(!boost::iterators::is_iterator< int[] >::value);
     BOOST_TEST(!boost::iterators::is_iterator< int[10] >::value);
     BOOST_TEST(!boost::iterators::is_iterator< int*[] >::value);