diff --git a/src/libraries/turtle/format.hpp b/src/libraries/turtle/format.hpp
index 18afa46..81b7fcc 100644
--- a/src/libraries/turtle/format.hpp
+++ b/src/libraries/turtle/format.hpp
@@ -13,7 +13,9 @@
 #include <boost/static_assert.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/integral_constant.hpp>
+#ifndef MOCK_NO_STL_FORMAT
 #include <boost/detail/container_fwd.hpp>
+#endif // MOCK_NO_STL_FORMAT
 #include <sstream>
 #include <ostream>
 
@@ -132,4 +134,22 @@ namespace detail
 #endif // MOCK_NO_STL_FORMAT
 }
 
+#ifndef MOCK_NO_BOOST_FORMAT
+namespace boost
+{
+namespace assign_detail
+{
+    template< typename T > class generic_list;
+}
+}
+namespace mock
+{
+    template< typename T >
+    std::string format( const boost::assign_detail::generic_list< T >& l )
+    {
+        return format( l.begin(), l.end() );
+    }
+}
+#endif // MOCK_NO_BOOST_FORMAT
+
 #endif // #ifndef MOCK_FORMAT_HPP_INCLUDED
diff --git a/src/tests/turtle_test/format_test.cpp b/src/tests/turtle_test/format_test.cpp
index 020a6f3..ab41c6a 100644
--- a/src/tests/turtle_test/format_test.cpp
+++ b/src/tests/turtle_test/format_test.cpp
@@ -7,13 +7,13 @@
 //
 
 #include <turtle/format.hpp>
+#include <boost/assign.hpp>
 #include <ostream>
 #include <deque>
 #include <list>
 #include <vector>
 #include <map>
 #include <set>
-#include <boost/assign.hpp>
 
 #include <boost/test/auto_unit_test.hpp>
 #define BOOST_LIB_NAME boost_unit_test_framework
@@ -150,3 +150,13 @@ BOOST_AUTO_TEST_CASE( std_multisets_are_serialized )
     s.insert( 42 );
     BOOST_CHECK_EQUAL( "(12,42)", mock::format( s ) );
 }
+
+BOOST_AUTO_TEST_CASE( boost_assign_list_of_are_serialized )
+{
+    BOOST_CHECK_EQUAL( "(12,42)", mock::format( boost::assign::list_of( 12 )( 42 ) ) );
+}
+
+BOOST_AUTO_TEST_CASE( boost_assign_map_list_of_are_serialized )
+{
+    BOOST_CHECK_EQUAL( "((12,\"12\"),(42,\"42\"))", mock::format( boost::assign::map_list_of( 12, "12" )( 42, "42" ) ) );
+}