diff --git a/include/boost/optional/detail/optional_utility.hpp b/include/boost/optional/detail/optional_utility.hpp
index 581a7e7..f7c04ff 100644
--- a/include/boost/optional/detail/optional_utility.hpp
+++ b/include/boost/optional/detail/optional_utility.hpp
@@ -25,9 +25,7 @@ inline constexpr T&& forward(typename boost::remove_reference<T>::type& t) noexc
 template <class T>
 inline constexpr T&& forward(typename boost::remove_reference<T>::type&& t) noexcept
 {
-#ifndef BOOST_NO_CXX11_STATIC_ASSERT
   static_assert(!boost::is_lvalue_reference<T>::value, "Can not forward an rvalue as an lvalue.");
-#endif
   return static_cast<T&&>(t);
 }
 
diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp
index 0fd4448..b8f402d 100644
--- a/include/boost/optional/optional.hpp
+++ b/include/boost/optional/optional.hpp
@@ -28,7 +28,6 @@
 #include <boost/core/invoke_swap.hpp>
 #include <boost/core/launder.hpp>
 #include <boost/optional/bad_optional_access.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/type_traits/alignment_of.hpp>
 #include <boost/type_traits/conditional.hpp>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index eedb6f8..9a03080 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,6 +6,6 @@ include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
 
 if(HAVE_BOOST_TEST)
 
-boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::optional Boost::core Boost::bind Boost::mpl Boost::tuple)
+boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::optional Boost::core Boost::bind Boost::tuple)
 
 endif()
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 33c3f25..21ea8d3 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -26,14 +26,14 @@ project
             cxx11_defaulted_moves
             cxx11_deleted_functions
             cxx11_explicit_conversion_operators
-            cxx11_noexcept
+#            cxx11_noexcept
             cxx11_rvalue_references
             cxx11_variadic_templates
         ]
     ;
 
 
-run optional_test.cpp : : : <library>/boost/bind//boost_bind <library>/boost/mpl//boost_mpl ;
+run optional_test.cpp : : : <library>/boost/bind//boost_bind ;
 run optional_test_assign.cpp ;
 run optional_test_swap.cpp ;
 compile optional_test_wuninitialized.cpp ;
diff --git a/test/optional_test.cpp b/test/optional_test.cpp
index bd8f90f..b7d9603 100644
--- a/test/optional_test.cpp
+++ b/test/optional_test.cpp
@@ -24,8 +24,6 @@
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #include "boost/bind/apply.hpp" // Included just to test proper interaction with boost::apply<> as reported by Daniel Wallin
 #endif
-#include "boost/mpl/bool.hpp"
-#include "boost/mpl/bool_fwd.hpp"  // For mpl::true_ and mpl::false_
 
 #include "boost/optional/optional.hpp"
 
diff --git a/test/optional_test_noexcept_move.cpp b/test/optional_test_noexcept_move.cpp
index 6ff8a9a..3aba93a 100644
--- a/test/optional_test_noexcept_move.cpp
+++ b/test/optional_test_noexcept_move.cpp
@@ -9,7 +9,6 @@
 // You are welcome to contact the author at:
 //  akrzemi1@gmail.com
 
-#include "boost/static_assert.hpp"
 #include "boost/optional/optional.hpp"
 
 #ifdef BOOST_BORLANDC