diff --git a/src/python/histogram.cpp b/src/python/histogram.cpp
index 5761cd12..f5f3d838 100644
--- a/src/python/histogram.cpp
+++ b/src/python/histogram.cpp
@@ -16,7 +16,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/static_visitor.hpp>
-#include <boost/mpl/for_each.hpp>
 #ifdef HAVE_NUMPY
 #include <boost/python/numpy.hpp>
 namespace np = boost::python::numpy;
@@ -163,7 +162,7 @@ bp::object histogram_init(bp::tuple args, bp::dict kwargs) {
   for (unsigned i = 0; i < dim; ++i) {
     bp::object pa = args[i + 1];
     bool success = false;
-    mpl::for_each<pyhistogram::any_axis_type::types>(
+    boost::mp11::mp_for_each<pyhistogram::any_axis_type::types>(
       axes_appender(pa, axes, success)
     );
     if (!success) {
diff --git a/test/histogram_test.cpp b/test/histogram_test.cpp
index 1820be86..fd20d278 100644
--- a/test/histogram_test.cpp
+++ b/test/histogram_test.cpp
@@ -18,7 +18,7 @@
 #include <boost/histogram/storage/adaptive_storage.hpp>
 #include <boost/histogram/storage/array_storage.hpp>
 #include <boost/histogram/storage/weight_counter.hpp>
-#include <boost/mpl/int.hpp>
+#include <boost/mp11.hpp>
 #include <cstdlib>
 #include <limits>
 #include <numeric>
@@ -30,7 +30,7 @@
 
 using namespace boost::histogram;
 using namespace boost::histogram::literals; // to get _c suffix
-namespace mpl = boost::mpl;
+namespace mp11 = boost::mp11;
 
 template <typename S, typename... Axes>
 auto make_histogram(static_tag, Axes &&... axes)
@@ -146,7 +146,7 @@ template <typename Type> void run_tests() {
     h(0, 0);
     auto h2 = decltype(h)(h);
     BOOST_TEST(h2 == h);
-    auto h3 = static_histogram<mpl::vector<axis::integer<>, axis::integer<>>,
+    auto h3 = static_histogram<mp11::mp_list<axis::integer<>, axis::integer<>>,
                                array_storage<unsigned>>(h);
     BOOST_TEST_EQ(h3, h);
   }
@@ -163,7 +163,7 @@ template <typename Type> void run_tests() {
     // test self-assign
     h2 = h2;
     BOOST_TEST_EQ(h, h2);
-    auto h3 = static_histogram<mpl::vector<axis::integer<>, axis::integer<>>,
+    auto h3 = static_histogram<mp11::mp_list<axis::integer<>, axis::integer<>>,
                                array_storage<unsigned>>();
     h3 = h;
     BOOST_TEST_EQ(h, h3);
@@ -940,7 +940,11 @@ int main() {
 
   // init
   {
-    auto v = std::vector<axis::any<>>();
+    auto v = std::vector<
+        axis::any<
+          axis::regular<>, axis::integer<>
+        >
+      >();
     v.push_back(axis::regular<>(4, -1, 1));
     v.push_back(axis::integer<>(1, 7));
     auto h = make_dynamic_histogram(v.begin(), v.end());